diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-16 13:19:33 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-16 13:19:33 +0000 |
| commit | 1c8cf4ef8338736ebcaa905f8932545a24e817c6 (patch) | |
| tree | 1511225a9139cd3f2113c9b908a88c70f4166958 /app/controllers/journals_controller.rb | |
| parent | abb0b15407b33cbe50dc263474631c5bfcf2bd5f (diff) | |
| download | redmine-1c8cf4ef8338736ebcaa905f8932545a24e817c6.tar.gz redmine-1c8cf4ef8338736ebcaa905f8932545a24e817c6.zip | |
Added the following permissions (#527, #585, #627):
* edit_issue_notes: let user edit any notes
* edit_own_issue_notes: let user edit his own notes only
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1152 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/journals_controller.rb')
| -rw-r--r-- | app/controllers/journals_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 05d41fa30..758b8507f 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -22,11 +22,11 @@ class JournalsController < ApplicationController def edit if request.post? @journal.update_attributes(:notes => params[:notes]) if params[:notes] + @journal.destroy if @journal.details.empty? && @journal.notes.blank? 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 |