Description:
Fix bug #23, #22, #21, #17
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r730:7917a0f3fcef - - 4 files changed: 4 inserted, 2 deleted
@@ -184,13 +184,13 | |||
|
184 | 184 | |
|
185 | 185 | def manage |
|
186 | 186 | @problems = Problem.order(date_added: :desc) |
|
187 | 187 | end |
|
188 | 188 | |
|
189 | 189 | def do_manage |
|
190 | - if params.has_key? 'change_date_added' | |
|
190 | + if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false | |
|
191 | 191 | change_date_added |
|
192 | 192 | elsif params.has_key? 'add_to_contest' |
|
193 | 193 | add_to_contest |
|
194 | 194 | elsif params.has_key? 'enable_problem' |
|
195 | 195 | set_available(true) |
|
196 | 196 | elsif params.has_key? 'disable_problem' |
@@ -40,13 +40,13 | |||
|
40 | 40 | pid = Problem.find_by_id(id.to_i) |
|
41 | 41 | @problems << pid if pid |
|
42 | 42 | end |
|
43 | 43 | end |
|
44 | 44 | |
|
45 | 45 | #users |
|
46 | - @users = if params[:user] == "all" then | |
|
46 | + @users = if params[:users] == "all" then | |
|
47 | 47 | User.includes(:contests).includes(:contest_stat) |
|
48 | 48 | else |
|
49 | 49 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
50 | 50 | end |
|
51 | 51 | |
|
52 | 52 | #set up range from param |
@@ -107,12 +107,13 | |||
|
107 | 107 | = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])" |
|
108 | 108 | |
|
109 | 109 | :javascript |
|
110 | 110 | $('.input-group.date').datetimepicker({ |
|
111 | 111 | format: 'DD/MMM/YYYY', |
|
112 | 112 | showTodayButton: true, |
|
113 | + locale: 'en', | |
|
113 | 114 | widgetPositioning: {horizontal: 'auto', vertical: 'bottom'}, |
|
114 | 115 | |
|
115 | 116 | }); |
|
116 | 117 | $('.datatable').DataTable({ |
|
117 | 118 | paging: false |
|
118 | 119 | }); |
You need to be logged in to leave comments.
Login now