Merge pull request #852 from mikeing2001/release_marks

Fix release marks issues. Closes #697 Closes #704
MarkUsProject · Sep 29, 2012 · 1f47141 · 1f47141
2 parents 2e51ac7 + 23b124d
commit 1f47141
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/views/assignments/_list.html.erb b/app/views/assignments/_list.html.erb
@@ -55,7 +55,11 @@
               <p><strong><%=h I18n.t("assignment.overall_comment") %></strong><br/>
                 <%= simple_format(sanitize(@a_id_results[assignment.id].overall_comment)) %>
               </p>
-              <%= link_to h(I18n.t('results.results_name')), :controller => "results", :action => 'view_marks', :id => assignment.id %>
+              <%= link_to h(I18n.t('results.results_name')),
+                       view_marks_assignment_submission_result_path(
+                            :assignment_id => assignment.id,
+                            :submission_id => @a_id_results[assignment.id].submission_id,
+                            :id => @a_id_results[assignment.id].id) %>
               <% elsif assignment.due_date < Time.zone.now %>
                 <%= I18n.t(:no_result) %>
               <% end %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -160,7 +160,7 @@
           get 'next_grouping'
           post 'remove_extra_mark'
           get 'expand_unmarked_criteria'
-          get 'set_released_to_students'
+          post 'set_released_to_students'
           post 'update_overall_comment'
           post 'update_overall_remark_comment'
           post 'update_marking_state'