| @@ -104,9 +104,11 class WikiPage < ActiveRecord::Base | |||||
| 104 | end |
|
104 | end | |
| 105 |
|
105 | |||
| 106 | def content_for_version(version=nil) |
|
106 | def content_for_version(version=nil) | |
| 107 | result = content.versions.find_by_version(version.to_i) if version |
|
107 | if content | |
| 108 | result ||= content |
|
108 | result = content.versions.find_by_version(version.to_i) if version | |
| 109 | result |
|
109 | result ||= content | |
|
|
110 | result | |||
|
|
111 | end | |||
| 110 | end |
|
112 | end | |
| 111 |
|
113 | |||
| 112 | def diff(version_to=nil, version_from=nil) |
|
114 | def diff(version_to=nil, version_from=nil) | |
| @@ -161,6 +161,11 class WikiControllerTest < ActionController::TestCase | |||||
| 161 | assert_template 'edit' |
|
161 | assert_template 'edit' | |
| 162 | end |
|
162 | end | |
| 163 |
|
163 | |||
|
|
164 | def test_show_specific_version_of_an_unexistent_page_without_edit_right | |||
|
|
165 | get :show, :project_id => 1, :id => 'Unexistent page', :version => 1 | |||
|
|
166 | assert_response 404 | |||
|
|
167 | end | |||
|
|
168 | ||||
| 164 | def test_show_unexistent_page_with_parent_should_preselect_parent |
|
169 | def test_show_unexistent_page_with_parent_should_preselect_parent | |
| 165 | @request.session[:user_id] = 2 |
|
170 | @request.session[:user_id] = 2 | |
| 166 | get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page' |
|
171 | get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page' | |
General Comments 0
You need to be logged in to leave comments.
Login now