##// END OF EJS Templates
remove trailing white-spaces from app/controllers/journals_controller.rb....
Toshi MARUYAMA -
r6763:db1ddd5509a0
parent child
Show More
@@ -1,119 +1,119
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 #
8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 #
13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class JournalsController < ApplicationController
19 19 before_filter :find_journal, :only => [:edit, :diff]
20 20 before_filter :find_issue, :only => [:new]
21 21 before_filter :find_optional_project, :only => [:index]
22 22 before_filter :authorize, :only => [:new, :edit, :diff]
23 23 accept_rss_auth :index
24 24 menu_item :issues
25
25
26 26 helper :issues
27 27 helper :custom_fields
28 28 helper :queries
29 29 include QueriesHelper
30 30 helper :sort
31 31 include SortHelper
32 32
33 33 def index
34 34 retrieve_query
35 35 sort_init 'id', 'desc'
36 36 sort_update(@query.sortable_columns)
37
37
38 38 if @query.valid?
39 @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
39 @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
40 40 :limit => 25)
41 41 end
42 42 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
43 43 render :layout => false, :content_type => 'application/atom+xml'
44 44 rescue ActiveRecord::RecordNotFound
45 45 render_404
46 46 end
47
47
48 48 def diff
49 49 @issue = @journal.issue
50 50 if params[:detail_id].present?
51 51 @detail = @journal.details.find_by_id(params[:detail_id])
52 52 else
53 53 @detail = @journal.details.detect {|d| d.prop_key == 'description'}
54 54 end
55 55 (render_404; return false) unless @issue && @detail
56 56 @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
57 57 end
58
58
59 59 def new
60 60 journal = Journal.find(params[:journal_id]) if params[:journal_id]
61 61 if journal
62 62 user = journal.user
63 63 text = journal.notes
64 64 else
65 65 user = @issue.author
66 66 text = @issue.description
67 67 end
68 68 # Replaces pre blocks with [...]
69 69 text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]')
70 70 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
71 71 content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
72
72
73 73 render(:update) { |page|
74 74 page.<< "$('notes').value = \"#{escape_javascript content}\";"
75 75 page.show 'update'
76 76 page << "Form.Element.focus('notes');"
77 77 page << "Element.scrollTo('update');"
78 78 page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
79 79 }
80 80 end
81
81
82 82 def edit
83 83 (render_403; return false) unless @journal.editable_by?(User.current)
84 84 if request.post?
85 85 @journal.update_attributes(:notes => params[:notes]) if params[:notes]
86 86 @journal.destroy if @journal.details.empty? && @journal.notes.blank?
87 87 call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
88 88 respond_to do |format|
89 89 format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
90 90 format.js { render :action => 'update' }
91 91 end
92 92 else
93 93 respond_to do |format|
94 94 format.html {
95 95 # TODO: implement non-JS journal update
96 render :nothing => true
96 render :nothing => true
97 97 }
98 98 format.js
99 99 end
100 100 end
101 101 end
102
102
103 103 private
104
104
105 105 def find_journal
106 106 @journal = Journal.find(params[:id])
107 107 @project = @journal.journalized.project
108 108 rescue ActiveRecord::RecordNotFound
109 109 render_404
110 110 end
111 111
112 112 # TODO: duplicated in IssuesController
113 113 def find_issue
114 114 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
115 115 @project = @issue.project
116 116 rescue ActiveRecord::RecordNotFound
117 117 render_404
118 118 end
119 119 end
General Comments 0
You need to be logged in to leave comments. Login now