Administrators can edit issue notes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1105 e93f8b46-1217-0410-a6f0-8f06a7374b81

8 files changed, 96 insertions, 1 deletions

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fdece9e1a..dfee53841 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -27,6 +27,7 @@ class IssuesController < ApplicationController
   
   cache_sweeper :issue_sweeper, :only => [ :new, :edit, :update, :destroy ]
 
+  helper :journals
   helper :projects
   include ProjectsHelper   
   helper :custom_fields
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
new file mode 100644
index 000000000..b867b4ae6
--- /dev/null
+++ b/app/controllers/journals_controller.rb
@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class JournalsController < ApplicationController
+  layout 'base'
+  before_filter :find_journal
+  
+  def edit
+    if request.post?
+      @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+      respond_to do |format|
+        format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
+        format.js { render :action => 'update' }
+      end
+      return
+    end
+  end
+  
+private
+  def find_journal
+    @journal = Journal.find(params[:id])
+    render_403 and return false unless @journal.editable_by?(User.current)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
new file mode 100644
index 000000000..c97446448
--- /dev/null
+++ b/app/helpers/journals_helper.rb
@@ -0,0 +1,37 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module JournalsHelper
+  def render_notes(journal, options={})
+    content = ''
+    editable = journal.editable_by?(User.current)
+    if editable
+      links = []
+      links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
+                                             { :controller => 'journals', :action => 'edit', :id => journal },
+                                                :title => l(:button_edit))
+      content << content_tag('div', links.join(' '), :class => 'contextual')
+    end
+    content << textilizable(journal, :notes)
+    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'editable' : nil))
+  end
+  
+  def link_to_in_place_notes_editor(text, field_id, url, options={})
+    onclick = "new Ajax.Request('#{url_for(url)}', {asynchronous:true, evalScripts:true, method:'get'}); return false;"
+    link_to text, '#', options.merge(:onclick => onclick)
+  end
+end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index d02067a9d..df7308435 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -49,4 +49,8 @@ class Journal < ActiveRecord::Base
     c = details.detect {|detail| detail.prop_key == prop}
     c ? c.value : nil
   end
+  
+  def editable_by?(usr)
+    usr && usr.admin?
+  end
 end
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index bab37b4fd..edfb9b94d 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -8,6 +8,6 @@
 	   <li><%= show_detail(detail) %></li>
 	<% end %>
 	</ul>
-  	<%= textilizable(journal.notes) unless journal.notes.blank? %>
+	<%= render_notes(journal) unless journal.notes.blank? %>
   	<% note_id += 1 %>
 <% end %>
diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml
new file mode 100644
index 000000000..9baec03fa
--- /dev/null
+++ b/app/views/journals/_notes_form.rhtml
@@ -0,0 +1,7 @@
+<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+    <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', 
+                                              :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <p><%= submit_tag l(:button_save) %>
+    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
+                                                    "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
+<% end %>
diff --git a/app/views/journals/edit.rjs b/app/views/journals/edit.rjs
new file mode 100644
index 000000000..798cb0f04
--- /dev/null
+++ b/app/views/journals/edit.rjs
@@ -0,0 +1,3 @@
+page.hide "journal-#{@journal.id}-notes"
+page.insert_html :after, "journal-#{@journal.id}-notes",
+                 :partial => 'notes_form'
diff --git a/app/views/journals/update.rjs b/app/views/journals/update.rjs
new file mode 100644
index 000000000..9da0ebeae
--- /dev/null
+++ b/app/views/journals/update.rjs
@@ -0,0 +1,3 @@
+page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
+page.show "journal-#{@journal.id}-notes"
+page.remove "journal-#{@journal.id}-form"