isoron/wikiufc
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix WikiPage.from_param

Browse Source
This commit is contained in:
Alinson S. Xavier
2015-09-04 18:21:24 -04:00
parent ae098bd45c
commit 345da92e46
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/wiki_controller.rb
View File

@@ -164,7 +164,7 @@ class WikiController < ApplicationController
@course = Course.from_param(params[:course_id])
if params[:id]
@wiki_page = WikiPage.from_param(params[:id])
@wiki_page = WikiPage.from_param(@course, params[:id])
else
@wiki_page = WikiPage.new(params[:wiki_page])
end

2
app/models/course.rb
View File

@@ -88,6 +88,6 @@ class Course < ActiveRecord::Base
end
def self.from_param(param)
param.is_numeric? ? Course.find(param) : Course.find_by_short_name(param)
param.is_numeric? ? Course.find(param) : Course.find_by_short_name!(param)
end
end

6
app/models/wiki_page.rb
View File

@@ -79,11 +79,11 @@ class WikiPage < ActiveRecord::Base
canonical_title || id
end
def self.from_param(param)
def self.from_param(course, param)
if param.is_numeric?
WikiPage.find!(param)
course.wiki_pages.find(param)
else
WikiPage.find_by_canonical_title!(param)
course.wiki_pages.find_by_canonical_title!(param)
end
end