cafe-grader-web

Commit r767:aac82fe8b800 public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r767:aac82fe8b800 - - 1 file changed: 6 inserted, 0 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -138,24 +138,30
138 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
138 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
139
139
140 #singular resource
140 #singular resource
141 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
141 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
142 #report
142 #report
143 resource :report, only: [], controller: 'report' do
143 resource :report, only: [], controller: 'report' do
144 get 'login'
144 get 'login'
145 get 'multiple_login'
145 get 'multiple_login'
146 get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
146 get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
147 get 'current_score(/:group_id)', action: 'current_score', as: 'current_score'
147 get 'current_score(/:group_id)', action: 'current_score', as: 'current_score'
148 get 'max_score'
148 get 'max_score'
149 post 'show_max_score'
149 post 'show_max_score'
150 + get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
151 + get 'stuck'
152 + get 'cheat_report'
153 + post 'cheat_report'
154 + get 'cheat_scruntinize'
155 + post 'cheat_scruntinize'
150 end
156 end
151 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
157 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
152 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
158 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
153 #get "report/login"
159 #get "report/login"
154 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
160 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
155 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
161 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
156
162
157 resource :main, only: [], controller: 'main' do
163 resource :main, only: [], controller: 'main' do
158 get 'login'
164 get 'login'
159 get 'logout'
165 get 'logout'
160 get 'list'
166 get 'list'
161 get 'submission(/:id)', action: 'submission', as: 'main_submission'
167 get 'submission(/:id)', action: 'submission', as: 'main_submission'
You need to be logged in to leave comments. Login now