jro_apps/redmine Commit - r2666:85ce903cfa5f

Ability to watch a wiki or a single wiki page (#413)....

Jean-Philippe Lang -

r2666:85ce903cfa5f

parent child

Context file:

r2666:85ce903cfa5f

app/controllers/wiki_controller.rb +1 0

               helper :attachments
               include AttachmentsHelper
+              helper :watchers
               # display a page (in editing mode if it doesn't exist)
               def index

app/models/mailer.rb +2 0

                                 'Wiki-Page-Id' => wiki_content.page.id
                 message_id wiki_content
                 recipients wiki_content.project.recipients
+                cc(wiki_content.page.wiki.watcher_recipients - recipients)
                 subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_added, :page => wiki_content.page.pretty_title)}"
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title)
                                 'Wiki-Page-Id' => wiki_content.page.id
                 message_id wiki_content
                 recipients wiki_content.project.recipients
+                cc(wiki_content.page.wiki.watcher_recipients + wiki_content.page.watcher_recipients - recipients)
                 subject "[#{wiki_content.project.name}] #{l(:mail_subject_wiki_content_updated, :page => wiki_content.page.pretty_title)}"
                 body :wiki_content => wiki_content,
                      :wiki_content_url => url_for(:controller => 'wiki', :action => 'index', :id => wiki_content.project, :page => wiki_content.page.title),

app/models/wiki.rb +4 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
               has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title'
               has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
+              acts_as_watchable
               validates_presence_of :start_page
               validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/

app/models/wiki_page.rb +4 -3

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               acts_as_tree :dependent => :nullify, :order => 'title'
+              acts_as_watchable
               acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                             :description => :text,
                             :datetime => :created_on,

app/views/wiki/show.rhtml +1 0

             <div class="contextual">
             <% if @editable %>
             <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+            <%= watcher_tag(@page, User.current) %>
             <%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
             <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
             <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>

app/views/wiki/special_date_index.rhtml +4 0

@@ -1,3 +1,7
		1	<div class="contextual">
		2	<%= watcher_tag(@wiki, User.current) %>
		3	</div>
		4
1	<h2><%= l(:label_index_by_date) %></h2>	5	<h2><%= l(:label_index_by_date) %></h2>
2		6
3	<% if @pages.empty? %>	7	<% if @pages.empty? %>

app/views/wiki/special_page_index.rhtml +4 0

@@ -1,3 +1,7
		1	<div class="contextual">
		2	<%= watcher_tag(@wiki, User.current) %>
		3	</div>
		4
1	<h2><%= l(:label_index_by_title) %></h2>	5	<h2><%= l(:label_index_by_title) %></h2>
2		6
3	<% if @pages.empty? %>	7	<% if @pages.empty? %>

General Comments 0

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

No TODOs yet

	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