Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

parasew · May 29, 2022 · a23c7e2 · a23c7e2
2 parents 94bcfab + 90efa50
commit a23c7e2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
@@ -341,6 +341,10 @@ def revision
     else
       get_page_and_revision
       @show_diff = (params[:mode] == 'diff')
+      if @nonexistent_revision
+        flash[:error] = "Redirected from nonexistent revision #{params['rev']}.".html_safe
+        redirect_to :web => @web_name, :action => 'revision', :id => @page_name, :mode => params[:mode], :rev => @revision_number
+      end
       @renderer = PageRenderer.new(@revision)
     end
   end
@@ -559,6 +563,7 @@ def get_page_and_revision
     if rev && rev > 0 && rev <= prs
       @revision_number = rev
     else
+      @nonexistent_revision = true
       @revision_number = prs
     end
     @revision = @page.revisions[@revision_number - 1]

diff --git a/public/s5/ui/core/math.css b/public/s5/ui/core/math.css
@@ -78,3 +78,6 @@ span.theorem_label {font-style:normal; font-weight:bold;}
   font-weight: bold;
 }
 .maruku_toc ul { list-style: none; }
+.scaled50 {transform: scale(.5) translate(0%,-50%);}
+.scaled625 {transform: scale(.625) translate(0%,-35%);}
+.scaled75 {transform: scale(.75) translate(0%,-33%);}
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
@@ -464,6 +464,14 @@ def test_revision
     assert_equal @home.revisions[0], r.template_objects['revision'] 
   end
 
+  def test_nonexistent_revision
+    r = process 'revision', 'web' => 'wiki1', 'id' => 'HomePage', 'rev' => '100'
+
+    assert_response(302)
+    assert_redirected_to :web => 'wiki1', :controller => 'wiki', :action => 'revision', :id => 'HomePage', :rev => '2'
+    assert r.flash[:error].to_s =~ /Redirected from nonexistent revision 100/
+  end
+
   def test_rollback
     # rollback shows a form where a revision can be edited.
     # its assigns the same as or revision
@@ -808,8 +816,8 @@ def test_dnsbl_filter_deny_action
 
     assert_equal 403, r.response_code
     resp = [ %{<p>Access denied. Your IP address, 127.0.0.2, was found on one or more DNSBL blocking list(s).</p>\n},
-             %{<p>See <a href='http://www.spamcop.net/w3m?action=checkblock&amp;ip=127.0.0.2'>here</a> for more information.</p>\n},
-             %{<p>See <a href='http://www.spamhaus.org/query/bl?ip=127.0.0.2'>here</a> for more information.</p>\n}]
+             %{<p>See <a href='https://www.spamcop.net/w3m?action=checkblock&amp;ip=127.0.0.2'>here</a> for more information.</p>\n},
+             %{<p>See <a href='https://www.spamhaus.org/query/bl?ip=127.0.0.2'>here</a> for more information.</p>\n}]
     resp.each {|re| assert_match Regexp.new(Regexp.escape(re)), r.body}
     assert !File.exist?(File.join(RAILS_ROOT, 'tmp', 'cache', "wiki1_HomePage.cache"))
   end