{"action":"created","comment":{"url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/comments/51696589","id":51696589,"diff_hunk":"@@ -19,7 +20,42 @@ def new\n   end\n \n   def index\n-    @competitions = Competition.all.select([:id, :name, :cityName, :countryId]).order(:year, :month, :day).reverse_order\n+    @regions = { '' => [[\"All\",\"all\"]],\n+                 'Continent' => Continent.all.map { |continent| [continent.name, continent.id] },\n+                 'Country' => Country.all.map { |country| [country.name, country.id] } }\n+    @events = [ [\"All\", \"all\"], [\"\",\"\"] ] + Event.all_official.map { |event| [event.name, event.id] }\n+    @years = [ [\"Current\",\"current\"],[\"All\",\"all\"],[\"\",\"\"] ] + Competition.select(:year).map(&:year).uniq.reverse!\n+    @competitions = Competition.where(showAtAll: true).order(:year, :month, :day).reverse_order\n+\n+    # This need to be the first thing, otherwise @competitions will be an array instead of an object\n+    # and the .where will not work\n+    if params[:years].blank?\n+      params[:years] = \"current\"\n+    end\n+\n+    if params[:years] == \"current\"\n+      @competitions = @competitions.where(\"CAST(CONCAT(year,'-',month,'-',day) as Datetime) > ?\", (Date.today - PAST_COMPETITIONS_DAYS))\n+    elsif params[:years] != \"all\"\n+      @competitions = @competitions.reject { |competition| competition.year.to_s != params[:years] }\n+    end\n+\n+    if params[:event] && params[:event] != \"all\"\n+      @competitions = @competitions.reject { |competition| !competition.has_event?(Event.find(params[:event])) }\n+    end\n+\n+    if params[:region] && params[:region] != \"all\"\n+      @competitions = @competitions.reject { |competition| !competition.belongs_to_region?(params[:region]) }\n+    end\n+\n+    if params[:search].present?\n+      @competitions = @competitions.reject { |competition| !competition.contains?(params[:search]) }\n+    end\n+\n+    if !params[:display].present?\n+      params[:display] = \"List\"\n+    end\n+\n+    @past_competitions, @future_competitions = @competitions.partition { |c| c.is_over? }","path":"WcaOnRails/app/controllers/competitions_controller.rb","position":50,"original_position":50,"commit_id":"498a2c2c83a1ee27ca45ff245df8a4908a555d13","original_commit_id":"498a2c2c83a1ee27ca45ff245df8a4908a555d13","user":{"login":"pedrosino","id":1881933,"avatar_url":"https://avatars.githubusercontent.com/u/1881933?v=3","gravatar_id":"","url":"https://api.github.com/users/pedrosino","html_url":"https://github.com/pedrosino","followers_url":"https://api.github.com/users/pedrosino/followers","following_url":"https://api.github.com/users/pedrosino/following{/other_user}","gists_url":"https://api.github.com/users/pedrosino/gists{/gist_id}","starred_url":"https://api.github.com/users/pedrosino/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pedrosino/subscriptions","organizations_url":"https://api.github.com/users/pedrosino/orgs","repos_url":"https://api.github.com/users/pedrosino/repos","events_url":"https://api.github.com/users/pedrosino/events{/privacy}","received_events_url":"https://api.github.com/users/pedrosino/received_events","type":"User","site_admin":false},"body":"Yeah, i forgot to change that.\r\n\r\nAlso, I believe it is (&:is_over?) (with : instead of . )","created_at":"2016-02-03T09:28:24Z","updated_at":"2016-02-03T09:28:24Z","html_url":"https://github.com/cubing/worldcubeassociation.org/pull/319#discussion_r51696589","pull_request_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319","_links":{"self":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/comments/51696589"},"html":{"href":"https://github.com/cubing/worldcubeassociation.org/pull/319#discussion_r51696589"},"pull_request":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319"}}},"pull_request":{"url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319","id":55790006,"html_url":"https://github.com/cubing/worldcubeassociation.org/pull/319","diff_url":"https://github.com/cubing/worldcubeassociation.org/pull/319.diff","patch_url":"https://github.com/cubing/worldcubeassociation.org/pull/319.patch","issue_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/319","number":319,"state":"open","locked":false,"title":"New competitions index.","user":{"login":"pedrosino","id":1881933,"avatar_url":"https://avatars.githubusercontent.com/u/1881933?v=3","gravatar_id":"","url":"https://api.github.com/users/pedrosino","html_url":"https://github.com/pedrosino","followers_url":"https://api.github.com/users/pedrosino/followers","following_url":"https://api.github.com/users/pedrosino/following{/other_user}","gists_url":"https://api.github.com/users/pedrosino/gists{/gist_id}","starred_url":"https://api.github.com/users/pedrosino/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pedrosino/subscriptions","organizations_url":"https://api.github.com/users/pedrosino/orgs","repos_url":"https://api.github.com/users/pedrosino/repos","events_url":"https://api.github.com/users/pedrosino/events{/privacy}","received_events_url":"https://api.github.com/users/pedrosino/received_events","type":"User","site_admin":false},"body":"Fixes #300.","created_at":"2016-01-12T17:29:10Z","updated_at":"2016-02-03T09:28:24Z","closed_at":null,"merged_at":null,"merge_commit_sha":"56eed9b35a265492e0f87b21e45ff513ec561ae3","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319/commits","review_comments_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319/comments","review_comment_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/comments{/number}","comments_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/319/comments","statuses_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/statuses/498a2c2c83a1ee27ca45ff245df8a4908a555d13","head":{"label":"pedrosino:master","ref":"master","sha":"498a2c2c83a1ee27ca45ff245df8a4908a555d13","user":{"login":"pedrosino","id":1881933,"avatar_url":"https://avatars.githubusercontent.com/u/1881933?v=3","gravatar_id":"","url":"https://api.github.com/users/pedrosino","html_url":"https://github.com/pedrosino","followers_url":"https://api.github.com/users/pedrosino/followers","following_url":"https://api.github.com/users/pedrosino/following{/other_user}","gists_url":"https://api.github.com/users/pedrosino/gists{/gist_id}","starred_url":"https://api.github.com/users/pedrosino/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pedrosino/subscriptions","organizations_url":"https://api.github.com/users/pedrosino/orgs","repos_url":"https://api.github.com/users/pedrosino/repos","events_url":"https://api.github.com/users/pedrosino/events{/privacy}","received_events_url":"https://api.github.com/users/pedrosino/received_events","type":"User","site_admin":false},"repo":{"id":45578783,"name":"worldcubeassociation.org","full_name":"pedrosino/worldcubeassociation.org","owner":{"login":"pedrosino","id":1881933,"avatar_url":"https://avatars.githubusercontent.com/u/1881933?v=3","gravatar_id":"","url":"https://api.github.com/users/pedrosino","html_url":"https://github.com/pedrosino","followers_url":"https://api.github.com/users/pedrosino/followers","following_url":"https://api.github.com/users/pedrosino/following{/other_user}","gists_url":"https://api.github.com/users/pedrosino/gists{/gist_id}","starred_url":"https://api.github.com/users/pedrosino/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pedrosino/subscriptions","organizations_url":"https://api.github.com/users/pedrosino/orgs","repos_url":"https://api.github.com/users/pedrosino/repos","events_url":"https://api.github.com/users/pedrosino/events{/privacy}","received_events_url":"https://api.github.com/users/pedrosino/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/pedrosino/worldcubeassociation.org","description":"[WCA Project] All of the code that runs on worldcubeassociation.org","fork":true,"url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org","forks_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/forks","keys_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/keys{/key_id}","collaborators_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/teams","hooks_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/hooks","issue_events_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/issues/events{/number}","events_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/events","assignees_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/assignees{/user}","branches_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/branches{/branch}","tags_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/tags","blobs_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/git/refs{/sha}","trees_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/git/trees{/sha}","statuses_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/statuses/{sha}","languages_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/languages","stargazers_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/stargazers","contributors_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/contributors","subscribers_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/subscribers","subscription_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/subscription","commits_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/commits{/sha}","git_commits_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/git/commits{/sha}","comments_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/comments{/number}","issue_comment_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/issues/comments{/number}","contents_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/contents/{+path}","compare_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/compare/{base}...{head}","merges_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/merges","archive_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/downloads","issues_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/issues{/number}","pulls_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/pulls{/number}","milestones_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/milestones{/number}","notifications_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/labels{/name}","releases_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/releases{/id}","deployments_url":"https://api.github.com/repos/pedrosino/worldcubeassociation.org/deployments","created_at":"2015-11-05T01:22:31Z","updated_at":"2016-01-11T18:58:19Z","pushed_at":"2016-02-03T00:47:03Z","git_url":"git://github.com/pedrosino/worldcubeassociation.org.git","ssh_url":"git@github.com:pedrosino/worldcubeassociation.org.git","clone_url":"https://github.com/pedrosino/worldcubeassociation.org.git","svn_url":"https://github.com/pedrosino/worldcubeassociation.org","homepage":"https://www.worldcubeassociation.org/","size":50195,"stargazers_count":0,"watchers_count":0,"language":"PHP","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":"cubing:master","ref":"master","sha":"469cf332d739d98b0523732986013bee640eb5be","user":{"login":"cubing","id":1092267,"avatar_url":"https://avatars.githubusercontent.com/u/1092267?v=3","gravatar_id":"","url":"https://api.github.com/users/cubing","html_url":"https://github.com/cubing","followers_url":"https://api.github.com/users/cubing/followers","following_url":"https://api.github.com/users/cubing/following{/other_user}","gists_url":"https://api.github.com/users/cubing/gists{/gist_id}","starred_url":"https://api.github.com/users/cubing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cubing/subscriptions","organizations_url":"https://api.github.com/users/cubing/orgs","repos_url":"https://api.github.com/users/cubing/repos","events_url":"https://api.github.com/users/cubing/events{/privacy}","received_events_url":"https://api.github.com/users/cubing/received_events","type":"Organization","site_admin":false},"repo":{"id":34161579,"name":"worldcubeassociation.org","full_name":"cubing/worldcubeassociation.org","owner":{"login":"cubing","id":1092267,"avatar_url":"https://avatars.githubusercontent.com/u/1092267?v=3","gravatar_id":"","url":"https://api.github.com/users/cubing","html_url":"https://github.com/cubing","followers_url":"https://api.github.com/users/cubing/followers","following_url":"https://api.github.com/users/cubing/following{/other_user}","gists_url":"https://api.github.com/users/cubing/gists{/gist_id}","starred_url":"https://api.github.com/users/cubing/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cubing/subscriptions","organizations_url":"https://api.github.com/users/cubing/orgs","repos_url":"https://api.github.com/users/cubing/repos","events_url":"https://api.github.com/users/cubing/events{/privacy}","received_events_url":"https://api.github.com/users/cubing/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/cubing/worldcubeassociation.org","description":"[WCA Project] All of the code that runs on worldcubeassociation.org","fork":false,"url":"https://api.github.com/repos/cubing/worldcubeassociation.org","forks_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/forks","keys_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/teams","hooks_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/hooks","issue_events_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/events{/number}","events_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/events","assignees_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/assignees{/user}","branches_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/branches{/branch}","tags_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/tags","blobs_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/git/refs{/sha}","trees_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/statuses/{sha}","languages_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/languages","stargazers_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/stargazers","contributors_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/contributors","subscribers_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/subscribers","subscription_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/subscription","commits_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/commits{/sha}","git_commits_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/git/commits{/sha}","comments_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/comments{/number}","issue_comment_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/comments{/number}","contents_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/contents/{+path}","compare_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/merges","archive_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/downloads","issues_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues{/number}","pulls_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls{/number}","milestones_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/milestones{/number}","notifications_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/labels{/name}","releases_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/releases{/id}","deployments_url":"https://api.github.com/repos/cubing/worldcubeassociation.org/deployments","created_at":"2015-04-18T10:21:53Z","updated_at":"2016-01-19T22:28:28Z","pushed_at":"2016-02-02T23:35:46Z","git_url":"git://github.com/cubing/worldcubeassociation.org.git","ssh_url":"git@github.com:cubing/worldcubeassociation.org.git","clone_url":"https://github.com/cubing/worldcubeassociation.org.git","svn_url":"https://github.com/cubing/worldcubeassociation.org","homepage":"https://www.worldcubeassociation.org/","size":50285,"stargazers_count":6,"watchers_count":6,"language":"PHP","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":17,"mirror_url":null,"open_issues_count":131,"forks":17,"open_issues":131,"watchers":6,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319"},"html":{"href":"https://github.com/cubing/worldcubeassociation.org/pull/319"},"issue":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/319"},"comments":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/issues/319/comments"},"review_comments":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319/comments"},"review_comment":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/pulls/319/commits"},"statuses":{"href":"https://api.github.com/repos/cubing/worldcubeassociation.org/statuses/498a2c2c83a1ee27ca45ff245df8a4908a555d13"}}}}