cafe-grader-web

Commit r675:4404040ff0ce public

parent | child
Description:
sort available problem group by date_added, name bulk manage user filter by remark as well
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r675:4404040ff0ce - - 2 files changed: 12 inserted, 2 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -412,7 +412,7
412 def bulk_manage
412 def bulk_manage
413
413
414 begin
414 begin
415 - @users = User.where('login REGEXP ?',params[:regex]) if params[:regex]
415 + @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
416 @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
416 @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
417 rescue Exception
417 rescue Exception
418 flash[:error] = 'Regular Expression is malformed'
418 flash[:error] = 'Regular Expression is malformed'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -317,7 +317,17
317 self.groups.each do |group|
317 self.groups.each do |group|
318 group.problems.where(available: true).each { |p| problem << p }
318 group.problems.where(available: true).each { |p| problem << p }
319 end
319 end
320 - return problem.uniq
320 + problem.uniq!.sort! do |a,b|
321 + case
322 + when a.date_added < b.date_added
323 + -1
324 + when a.date_added > b.date_added
325 + 1
326 + else
327 + a.name <=> b.name
328 + end
329 + end
330 + return problem
321 end
331 end
322
332
323 def can_view_problem?(problem)
333 def can_view_problem?(problem)
You need to be logged in to leave comments. Login now