cafe-grader-web Commit - r657:c28f8e937d0d

cafe-grader-web

Commit `r657:c28f8e937d0d` public

parent | child

Description:

- clean up link to problem stat and user stat (grafted from 45d1e12e9794a23a5431222fe2f4c7461d73a529)

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r657:c28f8e937d0d - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

app/controllers/users_controller.rb ¶ +1 -1

                   redirect_to :action => 'forget'
                 end
-            -   def profile
+            +   def stat
                   @user = User.find(params[:id])
                   @submission = Submission.includes(:problem).where(user_id: params[:id])

app/views/graders/list.html.haml ¶ +6 -6

                     %tbody
                       - @submission.each do |sub|
                         %tr.inactive
-            -             %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
+            +             %td= link_to sub.id, submission_path(sub.id)
-            -             %td= sub.try(:user).try(:full_name)
+            +             %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= sub.try(:problem).try(:full_name)
+            +             %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment
                     %tbody
                       - @backlog_submission.each do |sub|
                         %tr.inactive
-            -             %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
+            +             %td= link_to sub.id, submission_path(sub.id)
-            -             %td= sub.try(:user).try(:full_name)
+            +             %td= link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id)
-            -             %td= sub.try(:problem).try(:full_name)
+            +             %td= link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)
                           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
                           %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " "
                           %td= sub.grader_comment

app/views/problems/stat.html.haml ¶ +2 -2

                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
                       %tr{class: row_odd ? "info-odd" : "info-even"}
-            -           %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id
+            +           %td= link_to sub.id, submission_path(sub)
-            -           %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id
+            +           %td= link_to sub.user.login, stat_user_path(sub.user)
                         %td= sub.user.full_name
                         %td= time_ago_in_words(sub.submitted_at) + " ago"
                         %td= sub.points

app/views/submissions/show.html.haml ¶ +2 -2

                           %strong User
                         %td
                           - if @submission.user
-            -               = link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
+            +               = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                             = @submission.user.full_name
                           - else
                             = "(n/a)"
                           %strong Task
                         %td
                           - if @submission.problem!=nil
-            -               = link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
+            +               = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
                             = @submission.problem.full_name
                           - else
                             = "(n/a)"

app/views/users/stat.html.haml ⬅ ~~app/views/users/profile.html.haml~~ renamed ¶ +2 -2

                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
-            -         %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
+            +         %td= link_to s.id, submission_path(s)
-            -         %td= link_to s.problem.name, controller: "problems", action: "stat", id: s.problem
+            +         %td= link_to s.problem.name, stat_problem_path(s.problem)
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)

config/routes.rb ¶ +2

                   member do
                     get 'toggle'
                     get 'toggle_test'
+            +       get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
+            +       get 'stat'
                   end
                 end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r657:c28f8e937d0d - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

Sign in to your account

Commit r657:c28f8e937d0d public

Author

r657:c28f8e937d0d - Wed, 12 Oct 2016 08:39:58 - 6 files changed: 15 inserted, 13 deleted

Commit `r657:c28f8e937d0d` public