jro_apps/redmine Commit - r7852:b8a924e4e1cb

Adds #current_version? method to wiki content....

Jean-Philippe Lang -

r7852:b8a924e4e1cb

parent child

Context file:

r7852:b8a924e4e1cb

Collapse all files

app/controllers/wiki_controller.rb +1 -1

                 end
                 @editable = editable?
                 @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
-                  @content.version == @page.content.version &&
+                  @content.current_version? &&
                   Redmine::WikiFormatting.supports_section_edit?
                 render :action => 'show'

app/models/wiki_content.rb +10 0

                 notified.collect(&:mail)
               end
+              # Return true if the content is the current page content
+              def current_version?
+                true
+              end
               class Version
                 belongs_to :page, :class_name => '::WikiPage', :foreign_key => 'page_id'
                 belongs_to :author, :class_name => '::User', :foreign_key => 'author_id'
                   page.project
                 end
+                # Return true if the content is the current page content
+                def current_version?
+                  page.content.version == self.version
+                end
                 # Returns the previous version or nil
                 def previous
                   @previous ||= WikiContent::Version.find(:first,

app/views/wiki/show.html.erb +4 -4

             <div class="contextual">
             <% if @editable %>
-            <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+            <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.current_version? %>
             <%= watcher_tag(@page, User.current) %>
             <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
             <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
-            <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
+            <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.current_version? %>
             <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
-            <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
+            <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') unless @content.current_version? %>
             <% end %>
             <%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
             </div>
             <%= wiki_page_breadcrumb(@page) %>
-            <% if @content.version != @page.content.version %>
+            <% unless @content.current_version? %>
                 <p>
                 <%= link_to(("\xc2\xab " + l(:label_previous)),
                             :action => 'show', :id => @page.title, :project_id => @page.project,

test/fixtures/wiki_content_versions.yml +24 0

@@ -64,6 +64,8 wiki_content_versions_005:
64	@WHATEVER@	64	@WHATEVER@
65		65
66	Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.	66	Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.
		67
		68	Cras ipsum felis, ultrices at porttitor vel, faucibus eu nunc.
67		69
68	h2. Heading 2	70	h2. Heading 2
69		71
@@ -75,4 +77,26 wiki_content_versions_005:
75	version: 2	77	version: 2
76	author_id: 1	78	author_id: 1
77	comments:	79	comments:
		80	wiki_content_versions_006:
		81	data: \|-
		82	h1. Title
		83
		84	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
		85
		86	h2. Heading 1
		87
		88	@WHATEVER@
		89
		90	Maecenas sed elit sit amet mi accumsan vestibulum non nec velit. Proin porta tincidunt lorem, consequat rhoncus dolor fermentum in.
		91
		92	h2. Heading 2
		93
		94	Morbi facilisis accumsan orci non pharetra.
		95	updated_on: 2007-03-08 00:18:07 +01:00
		96	page_id: 11
		97	wiki_content_id: 11
		98	id: 6
		99	version: 3
		100	author_id: 1
		101	comments:
78		102

test/unit/wiki_content_test.rb +7 0

@@ -85,4 +85,11 class WikiContentTest < ActiveSupport::TestCase
85	page.reload	85	page.reload
86	assert_equal 500.kilobyte, page.content.text.size	86	assert_equal 500.kilobyte, page.content.text.size
87	end	87	end
		88
		89	def test_current_version
		90	content = WikiContent.find(11)
		91	assert_equal true, content.current_version?
		92	assert_equal true, content.versions.first(:order => 'version DESC').current_version?
		93	assert_equal false, content.versions.first(:order => 'version ASC').current_version?
		94	end
88	end	95	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages