{"action":"created","comment":{"url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/comments/29509728","id":29509728,"diff_hunk":"@@ -253,27 +104,74 @@ def student_interface\n   def get_mark_columns\n     grade_entry_form = GradeEntryForm.find(params[:id])\n     grade_entry_items_columns = grade_entry_form.grade_entry_items\n-\n     c = grade_entry_items_columns.map do |column|\n       {\n-        id: column.name,\n+        id: column.id,\n         content: column.name + ' (' + column.out_of.to_s + ')',\n         sortable: true,\n-        searcheable: true\n+        compare: 'compare_gradebox'\n       }\n     end\n     if grade_entry_form.show_total\n       c <<\n-      {\n-        id: 'total_marks',\n-        content: t('grade_entry_forms.grades.total') \\\n-                 + ' ' + grade_entry_form.out_of_total.to_s,\n-      }\n+        {\n+          id: 'total_marks',\n+          content: t('grade_entry_forms.grades.total') \\\n+                   + ' ' + grade_entry_form.out_of_total.to_s,\n+          sortable: true,\n+          compare: 'compare_gradebox'\n+        }\n+    end\n+    if current_user.admin? || current_user.ta?\n+      c <<\n+        {\n+          id: 'marking_state',\n+          content: t('grade_entry_forms.grades.marking_state'),\n+          sortable: true\n+        }\n     end\n \n     render json: c\n   end\n \n+  def populate_grades_table","path":"app/controllers/grade_entry_forms_controller.rb","position":238,"original_position":238,"commit_id":"e5e70627577661d069d1992f5e8988356ff5a064","original_commit_id":"e5e70627577661d069d1992f5e8988356ff5a064","user":{"login":"houndci","id":6697940,"avatar_url":"https://avatars.githubusercontent.com/u/6697940?v=3","gravatar_id":"","url":"https://api.github.com/users/houndci","html_url":"https://github.com/houndci","followers_url":"https://api.github.com/users/houndci/followers","following_url":"https://api.github.com/users/houndci/following{/other_user}","gists_url":"https://api.github.com/users/houndci/gists{/gist_id}","starred_url":"https://api.github.com/users/houndci/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/houndci/subscriptions","organizations_url":"https://api.github.com/users/houndci/orgs","repos_url":"https://api.github.com/users/houndci/repos","events_url":"https://api.github.com/users/houndci/events{/privacy}","received_events_url":"https://api.github.com/users/houndci/received_events","type":"User","site_admin":false},"body":"Assignment Branch Condition size for populate_grades_table is too high. [38.13/15]","created_at":"2015-05-01T15:49:29Z","updated_at":"2015-05-01T15:49:29Z","html_url":"https://github.com/MarkUsProject/Markus/pull/2120#discussion_r29509728","pull_request_url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120","_links":{"self":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/comments/29509728"},"html":{"href":"https://github.com/MarkUsProject/Markus/pull/2120#discussion_r29509728"},"pull_request":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120"}}},"pull_request":{"url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120","id":32715476,"html_url":"https://github.com/MarkUsProject/Markus/pull/2120","diff_url":"https://github.com/MarkUsProject/Markus/pull/2120.diff","patch_url":"https://github.com/MarkUsProject/Markus/pull/2120.patch","issue_url":"https://api.github.com/repos/MarkUsProject/Markus/issues/2120","number":2120,"state":"open","locked":false,"title":"Catch exceptions when populating submissions table","user":{"login":"oneohtrix","id":963922,"avatar_url":"https://avatars.githubusercontent.com/u/963922?v=3","gravatar_id":"","url":"https://api.github.com/users/oneohtrix","html_url":"https://github.com/oneohtrix","followers_url":"https://api.github.com/users/oneohtrix/followers","following_url":"https://api.github.com/users/oneohtrix/following{/other_user}","gists_url":"https://api.github.com/users/oneohtrix/gists{/gist_id}","starred_url":"https://api.github.com/users/oneohtrix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oneohtrix/subscriptions","organizations_url":"https://api.github.com/users/oneohtrix/orgs","repos_url":"https://api.github.com/users/oneohtrix/repos","events_url":"https://api.github.com/users/oneohtrix/events{/privacy}","received_events_url":"https://api.github.com/users/oneohtrix/received_events","type":"User","site_admin":false},"body":"Before, when any submission got into an invalid state, the helper\r\nfunction gathering all the table data would fail. This caused the table\r\nto not load at all. Now the error is caught, and an error boolean is\r\nplaced in the returned object, which the front-end then checks and\r\ndisplays an errored submission (a light red row) in the table.\r\nPopulation of other submissions should continue unaffected.","created_at":"2015-04-06T21:56:05Z","updated_at":"2015-05-01T15:49:30Z","closed_at":null,"merged_at":null,"merge_commit_sha":"fa3d1c1a04f8f338b3037c885c1d51a537cd5ce5","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120/commits","review_comments_url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120/comments","review_comment_url":"https://api.github.com/repos/MarkUsProject/Markus/pulls/comments{/number}","comments_url":"https://api.github.com/repos/MarkUsProject/Markus/issues/2120/comments","statuses_url":"https://api.github.com/repos/MarkUsProject/Markus/statuses/e5e70627577661d069d1992f5e8988356ff5a064","head":{"label":"oneohtrix:master","ref":"master","sha":"e5e70627577661d069d1992f5e8988356ff5a064","user":{"login":"oneohtrix","id":963922,"avatar_url":"https://avatars.githubusercontent.com/u/963922?v=3","gravatar_id":"","url":"https://api.github.com/users/oneohtrix","html_url":"https://github.com/oneohtrix","followers_url":"https://api.github.com/users/oneohtrix/followers","following_url":"https://api.github.com/users/oneohtrix/following{/other_user}","gists_url":"https://api.github.com/users/oneohtrix/gists{/gist_id}","starred_url":"https://api.github.com/users/oneohtrix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oneohtrix/subscriptions","organizations_url":"https://api.github.com/users/oneohtrix/orgs","repos_url":"https://api.github.com/users/oneohtrix/repos","events_url":"https://api.github.com/users/oneohtrix/events{/privacy}","received_events_url":"https://api.github.com/users/oneohtrix/received_events","type":"User","site_admin":false},"repo":{"id":19577180,"name":"Markus","full_name":"oneohtrix/Markus","owner":{"login":"oneohtrix","id":963922,"avatar_url":"https://avatars.githubusercontent.com/u/963922?v=3","gravatar_id":"","url":"https://api.github.com/users/oneohtrix","html_url":"https://github.com/oneohtrix","followers_url":"https://api.github.com/users/oneohtrix/followers","following_url":"https://api.github.com/users/oneohtrix/following{/other_user}","gists_url":"https://api.github.com/users/oneohtrix/gists{/gist_id}","starred_url":"https://api.github.com/users/oneohtrix/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/oneohtrix/subscriptions","organizations_url":"https://api.github.com/users/oneohtrix/orgs","repos_url":"https://api.github.com/users/oneohtrix/repos","events_url":"https://api.github.com/users/oneohtrix/events{/privacy}","received_events_url":"https://api.github.com/users/oneohtrix/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/oneohtrix/Markus","description":"Git repository of MarkUs","fork":true,"url":"https://api.github.com/repos/oneohtrix/Markus","forks_url":"https://api.github.com/repos/oneohtrix/Markus/forks","keys_url":"https://api.github.com/repos/oneohtrix/Markus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/oneohtrix/Markus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/oneohtrix/Markus/teams","hooks_url":"https://api.github.com/repos/oneohtrix/Markus/hooks","issue_events_url":"https://api.github.com/repos/oneohtrix/Markus/issues/events{/number}","events_url":"https://api.github.com/repos/oneohtrix/Markus/events","assignees_url":"https://api.github.com/repos/oneohtrix/Markus/assignees{/user}","branches_url":"https://api.github.com/repos/oneohtrix/Markus/branches{/branch}","tags_url":"https://api.github.com/repos/oneohtrix/Markus/tags","blobs_url":"https://api.github.com/repos/oneohtrix/Markus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/oneohtrix/Markus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/oneohtrix/Markus/git/refs{/sha}","trees_url":"https://api.github.com/repos/oneohtrix/Markus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/oneohtrix/Markus/statuses/{sha}","languages_url":"https://api.github.com/repos/oneohtrix/Markus/languages","stargazers_url":"https://api.github.com/repos/oneohtrix/Markus/stargazers","contributors_url":"https://api.github.com/repos/oneohtrix/Markus/contributors","subscribers_url":"https://api.github.com/repos/oneohtrix/Markus/subscribers","subscription_url":"https://api.github.com/repos/oneohtrix/Markus/subscription","commits_url":"https://api.github.com/repos/oneohtrix/Markus/commits{/sha}","git_commits_url":"https://api.github.com/repos/oneohtrix/Markus/git/commits{/sha}","comments_url":"https://api.github.com/repos/oneohtrix/Markus/comments{/number}","issue_comment_url":"https://api.github.com/repos/oneohtrix/Markus/issues/comments{/number}","contents_url":"https://api.github.com/repos/oneohtrix/Markus/contents/{+path}","compare_url":"https://api.github.com/repos/oneohtrix/Markus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/oneohtrix/Markus/merges","archive_url":"https://api.github.com/repos/oneohtrix/Markus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/oneohtrix/Markus/downloads","issues_url":"https://api.github.com/repos/oneohtrix/Markus/issues{/number}","pulls_url":"https://api.github.com/repos/oneohtrix/Markus/pulls{/number}","milestones_url":"https://api.github.com/repos/oneohtrix/Markus/milestones{/number}","notifications_url":"https://api.github.com/repos/oneohtrix/Markus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/oneohtrix/Markus/labels{/name}","releases_url":"https://api.github.com/repos/oneohtrix/Markus/releases{/id}","created_at":"2014-05-08T14:49:32Z","updated_at":"2015-05-01T15:49:07Z","pushed_at":"2015-05-01T15:49:06Z","git_url":"git://github.com/oneohtrix/Markus.git","ssh_url":"git@github.com:oneohtrix/Markus.git","clone_url":"https://github.com/oneohtrix/Markus.git","svn_url":"https://github.com/oneohtrix/Markus","homepage":"http://www.markusproject.org","size":21840,"stargazers_count":0,"watchers_count":0,"language":"Ruby","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"MarkUsProject:master","ref":"master","sha":"9684249713f705b2d27fbedc5116fb22cb9fadef","user":{"login":"MarkUsProject","id":415874,"avatar_url":"https://avatars.githubusercontent.com/u/415874?v=3","gravatar_id":"","url":"https://api.github.com/users/MarkUsProject","html_url":"https://github.com/MarkUsProject","followers_url":"https://api.github.com/users/MarkUsProject/followers","following_url":"https://api.github.com/users/MarkUsProject/following{/other_user}","gists_url":"https://api.github.com/users/MarkUsProject/gists{/gist_id}","starred_url":"https://api.github.com/users/MarkUsProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MarkUsProject/subscriptions","organizations_url":"https://api.github.com/users/MarkUsProject/orgs","repos_url":"https://api.github.com/users/MarkUsProject/repos","events_url":"https://api.github.com/users/MarkUsProject/events{/privacy}","received_events_url":"https://api.github.com/users/MarkUsProject/received_events","type":"Organization","site_admin":false},"repo":{"id":940538,"name":"Markus","full_name":"MarkUsProject/Markus","owner":{"login":"MarkUsProject","id":415874,"avatar_url":"https://avatars.githubusercontent.com/u/415874?v=3","gravatar_id":"","url":"https://api.github.com/users/MarkUsProject","html_url":"https://github.com/MarkUsProject","followers_url":"https://api.github.com/users/MarkUsProject/followers","following_url":"https://api.github.com/users/MarkUsProject/following{/other_user}","gists_url":"https://api.github.com/users/MarkUsProject/gists{/gist_id}","starred_url":"https://api.github.com/users/MarkUsProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/MarkUsProject/subscriptions","organizations_url":"https://api.github.com/users/MarkUsProject/orgs","repos_url":"https://api.github.com/users/MarkUsProject/repos","events_url":"https://api.github.com/users/MarkUsProject/events{/privacy}","received_events_url":"https://api.github.com/users/MarkUsProject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/MarkUsProject/Markus","description":"Git repository of MarkUs","fork":false,"url":"https://api.github.com/repos/MarkUsProject/Markus","forks_url":"https://api.github.com/repos/MarkUsProject/Markus/forks","keys_url":"https://api.github.com/repos/MarkUsProject/Markus/keys{/key_id}","collaborators_url":"https://api.github.com/repos/MarkUsProject/Markus/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/MarkUsProject/Markus/teams","hooks_url":"https://api.github.com/repos/MarkUsProject/Markus/hooks","issue_events_url":"https://api.github.com/repos/MarkUsProject/Markus/issues/events{/number}","events_url":"https://api.github.com/repos/MarkUsProject/Markus/events","assignees_url":"https://api.github.com/repos/MarkUsProject/Markus/assignees{/user}","branches_url":"https://api.github.com/repos/MarkUsProject/Markus/branches{/branch}","tags_url":"https://api.github.com/repos/MarkUsProject/Markus/tags","blobs_url":"https://api.github.com/repos/MarkUsProject/Markus/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/MarkUsProject/Markus/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/MarkUsProject/Markus/git/refs{/sha}","trees_url":"https://api.github.com/repos/MarkUsProject/Markus/git/trees{/sha}","statuses_url":"https://api.github.com/repos/MarkUsProject/Markus/statuses/{sha}","languages_url":"https://api.github.com/repos/MarkUsProject/Markus/languages","stargazers_url":"https://api.github.com/repos/MarkUsProject/Markus/stargazers","contributors_url":"https://api.github.com/repos/MarkUsProject/Markus/contributors","subscribers_url":"https://api.github.com/repos/MarkUsProject/Markus/subscribers","subscription_url":"https://api.github.com/repos/MarkUsProject/Markus/subscription","commits_url":"https://api.github.com/repos/MarkUsProject/Markus/commits{/sha}","git_commits_url":"https://api.github.com/repos/MarkUsProject/Markus/git/commits{/sha}","comments_url":"https://api.github.com/repos/MarkUsProject/Markus/comments{/number}","issue_comment_url":"https://api.github.com/repos/MarkUsProject/Markus/issues/comments{/number}","contents_url":"https://api.github.com/repos/MarkUsProject/Markus/contents/{+path}","compare_url":"https://api.github.com/repos/MarkUsProject/Markus/compare/{base}...{head}","merges_url":"https://api.github.com/repos/MarkUsProject/Markus/merges","archive_url":"https://api.github.com/repos/MarkUsProject/Markus/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/MarkUsProject/Markus/downloads","issues_url":"https://api.github.com/repos/MarkUsProject/Markus/issues{/number}","pulls_url":"https://api.github.com/repos/MarkUsProject/Markus/pulls{/number}","milestones_url":"https://api.github.com/repos/MarkUsProject/Markus/milestones{/number}","notifications_url":"https://api.github.com/repos/MarkUsProject/Markus/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/MarkUsProject/Markus/labels{/name}","releases_url":"https://api.github.com/repos/MarkUsProject/Markus/releases{/id}","created_at":"2010-09-26T16:18:08Z","updated_at":"2015-04-29T15:34:59Z","pushed_at":"2015-05-01T15:49:06Z","git_url":"git://github.com/MarkUsProject/Markus.git","ssh_url":"git@github.com:MarkUsProject/Markus.git","clone_url":"https://github.com/MarkUsProject/Markus.git","svn_url":"https://github.com/MarkUsProject/Markus","homepage":"http://www.markusproject.org","size":48343,"stargazers_count":124,"watchers_count":124,"language":"Ruby","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":151,"mirror_url":null,"open_issues_count":101,"forks":151,"open_issues":101,"watchers":124,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120"},"html":{"href":"https://github.com/MarkUsProject/Markus/pull/2120"},"issue":{"href":"https://api.github.com/repos/MarkUsProject/Markus/issues/2120"},"comments":{"href":"https://api.github.com/repos/MarkUsProject/Markus/issues/2120/comments"},"review_comments":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120/comments"},"review_comment":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/MarkUsProject/Markus/pulls/2120/commits"},"statuses":{"href":"https://api.github.com/repos/MarkUsProject/Markus/statuses/e5e70627577661d069d1992f5e8988356ff5a064"}}}}