##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: Unable to change locked, sticky flags and board when editing a message (#10564)....
Jean-Philippe Lang -
r9216:a7bacf70fb18
parent child
Show More
Side by Side Unified
Context file:
r9216:a7bacf70fb18 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,111 +1,110
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 Message < ActiveRecord::Base
19 19 include Redmine::SafeAttributes
20 20 belongs_to :board
21 21 belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
22 22 acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
23 23 acts_as_attachable
24 24 belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
25 25
26 26 acts_as_searchable :columns => ['subject', 'content'],
27 27 :include => {:board => :project},
28 28 :project_key => "#{Board.table_name}.project_id",
29 29 :date_column => "#{table_name}.created_on"
30 30 acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
31 31 :description => :content,
32 32 :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
33 33 :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
34 34 {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})}
35 35
36 36 acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
37 37 :author_key => :author_id
38 38 acts_as_watchable
39 39
40 attr_protected :locked, :sticky
41 40 validates_presence_of :board, :subject, :content
42 41 validates_length_of :subject, :maximum => 255
43 42 validate :cannot_reply_to_locked_topic, :on => :create
44 43
45 44 after_create :add_author_as_watcher, :update_parent_last_reply
46 45 after_update :update_messages_board
47 46 after_destroy :reset_board_counters
48 47
49 48 named_scope :visible, lambda {|*args| { :include => {:board => :project},
50 49 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
51 50
52 51 safe_attributes 'subject', 'content'
53 safe_attributes 'locked', 'sticky',
52 safe_attributes 'locked', 'sticky', 'board_id',
54 53 :if => lambda {|message, user|
55 54 user.allowed_to?(:edit_messages, message.project)
56 55 }
57 56
58 57 def visible?(user=User.current)
59 58 !user.nil? && user.allowed_to?(:view_messages, project)
60 59 end
61 60
62 61 def cannot_reply_to_locked_topic
63 62 # Can not reply to a locked topic
64 63 errors.add :base, 'Topic is locked' if root.locked? && self != root
65 64 end
66 65
67 66 def update_parent_last_reply
68 67 if parent
69 68 parent.reload.update_attribute(:last_reply_id, self.id)
70 69 end
71 70 board.reset_counters!
72 71 end
73 72
74 73 def update_messages_board
75 74 if board_id_changed?
76 75 Message.update_all("board_id = #{board_id}", ["id = ? OR parent_id = ?", root.id, root.id])
77 76 Board.reset_counters!(board_id_was)
78 77 Board.reset_counters!(board_id)
79 78 end
80 79 end
81 80
82 81 def reset_board_counters
83 82 board.reset_counters!
84 83 end
85 84
86 85 def sticky=(arg)
87 86 write_attribute :sticky, (arg == true || arg.to_s == '1' ? 1 : 0)
88 87 end
89 88
90 89 def sticky?
91 90 sticky == 1
92 91 end
93 92
94 93 def project
95 94 board.project
96 95 end
97 96
98 97 def editable_by?(usr)
99 98 usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
100 99 end
101 100
102 101 def destroyable_by?(usr)
103 102 usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
104 103 end
105 104
106 105 private
107 106
108 107 def add_author_as_watcher
109 108 Watcher.create(:watchable => self.root, :user => author)
110 109 end
111 110 end
Show file before | Show file after | Hide comments
@@ -1,185 +1,209
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 require File.expand_path('../../test_helper', __FILE__)
19 19 require 'messages_controller'
20 20
21 21 # Re-raise errors caught by the controller.
22 22 class MessagesController; def rescue_action(e) raise e end; end
23 23
24 24 class MessagesControllerTest < ActionController::TestCase
25 25 fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
26 26
27 27 def setup
28 28 @controller = MessagesController.new
29 29 @request = ActionController::TestRequest.new
30 30 @response = ActionController::TestResponse.new
31 31 User.current = nil
32 32 end
33 33
34 34 def test_show
35 35 get :show, :board_id => 1, :id => 1
36 36 assert_response :success
37 37 assert_template 'show'
38 38 assert_not_nil assigns(:board)
39 39 assert_not_nil assigns(:project)
40 40 assert_not_nil assigns(:topic)
41 41 end
42 42
43 43 def test_show_should_contain_reply_field_tags_for_quoting
44 44 @request.session[:user_id] = 2
45 45 get :show, :board_id => 1, :id => 1
46 46 assert_response :success
47 47
48 48 # tags required by MessagesController#quote
49 49 assert_tag 'input', :attributes => {:id => 'message_subject'}
50 50 assert_tag 'textarea', :attributes => {:id => 'message_content'}
51 51 assert_tag 'div', :attributes => {:id => 'reply'}
52 52 end
53 53
54 54 def test_show_with_pagination
55 55 message = Message.find(1)
56 56 assert_difference 'Message.count', 30 do
57 57 30.times do
58 58 message.children << Message.new(:subject => 'Reply', :content => 'Reply body', :author_id => 2, :board_id => 1)
59 59 end
60 60 end
61 61 get :show, :board_id => 1, :id => 1, :r => message.children.last(:order => 'id').id
62 62 assert_response :success
63 63 assert_template 'show'
64 64 replies = assigns(:replies)
65 65 assert_not_nil replies
66 66 assert !replies.include?(message.children.first(:order => 'id'))
67 67 assert replies.include?(message.children.last(:order => 'id'))
68 68 end
69 69
70 70 def test_show_with_reply_permission
71 71 @request.session[:user_id] = 2
72 72 get :show, :board_id => 1, :id => 1
73 73 assert_response :success
74 74 assert_template 'show'
75 75 assert_tag :div, :attributes => { :id => 'reply' },
76 76 :descendant => { :tag => 'textarea', :attributes => { :id => 'message_content' } }
77 77 end
78 78
79 79 def test_show_message_not_found
80 80 get :show, :board_id => 1, :id => 99999
81 81 assert_response 404
82 82 end
83 83
84 84 def test_get_new
85 85 @request.session[:user_id] = 2
86 86 get :new, :board_id => 1
87 87 assert_response :success
88 88 assert_template 'new'
89 89 end
90 90
91 91 def test_post_new
92 92 @request.session[:user_id] = 2
93 93 ActionMailer::Base.deliveries.clear
94 94 Setting.notified_events = ['message_posted']
95 95
96 96 post :new, :board_id => 1,
97 97 :message => { :subject => 'Test created message',
98 98 :content => 'Message body'}
99 99 message = Message.find_by_subject('Test created message')
100 100 assert_not_nil message
101 101 assert_redirected_to "/boards/1/topics/#{message.to_param}"
102 102 assert_equal 'Message body', message.content
103 103 assert_equal 2, message.author_id
104 104 assert_equal 1, message.board_id
105 105
106 106 mail = ActionMailer::Base.deliveries.last
107 107 assert_not_nil mail
108 108 assert_equal "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] Test created message", mail.subject
109 109 assert_mail_body_match 'Message body', mail
110 110 # author
111 111 assert mail.bcc.include?('jsmith@somenet.foo')
112 112 # project member
113 113 assert mail.bcc.include?('dlopper@somenet.foo')
114 114 end
115 115
116 116 def test_get_edit
117 117 @request.session[:user_id] = 2
118 118 get :edit, :board_id => 1, :id => 1
119 119 assert_response :success
120 120 assert_template 'edit'
121 121 end
122 122
123 123 def test_post_edit
124 124 @request.session[:user_id] = 2
125 125 post :edit, :board_id => 1, :id => 1,
126 126 :message => { :subject => 'New subject',
127 127 :content => 'New body'}
128 128 assert_redirected_to '/boards/1/topics/1'
129 129 message = Message.find(1)
130 130 assert_equal 'New subject', message.subject
131 131 assert_equal 'New body', message.content
132 132 end
133 133
134 def test_post_edit_sticky_and_locked
135 @request.session[:user_id] = 2
136 post :edit, :board_id => 1, :id => 1,
137 :message => { :subject => 'New subject',
138 :content => 'New body',
139 :locked => '1',
140 :sticky => '1'}
141 assert_redirected_to '/boards/1/topics/1'
142 message = Message.find(1)
143 assert_equal true, message.sticky?
144 assert_equal true, message.locked?
145 end
146
147 def test_post_edit_should_allow_to_change_board
148 @request.session[:user_id] = 2
149 post :edit, :board_id => 1, :id => 1,
150 :message => { :subject => 'New subject',
151 :content => 'New body',
152 :board_id => 2}
153 assert_redirected_to '/boards/2/topics/1'
154 message = Message.find(1)
155 assert_equal Board.find(2), message.board
156 end
157
134 158 def test_reply
135 159 @request.session[:user_id] = 2
136 160 post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
137 161 reply = Message.find(:first, :order => 'id DESC')
138 162 assert_redirected_to "/boards/1/topics/1?r=#{reply.id}"
139 163 assert Message.find_by_subject('Test reply')
140 164 end
141 165
142 166 def test_destroy_topic
143 167 @request.session[:user_id] = 2
144 168 assert_difference 'Message.count', -3 do
145 169 post :destroy, :board_id => 1, :id => 1
146 170 end
147 171 assert_redirected_to '/projects/ecookbook/boards/1'
148 172 assert_nil Message.find_by_id(1)
149 173 end
150 174
151 175 def test_destroy_reply
152 176 @request.session[:user_id] = 2
153 177 assert_difference 'Message.count', -1 do
154 178 post :destroy, :board_id => 1, :id => 2
155 179 end
156 180 assert_redirected_to '/boards/1/topics/1?r=2'
157 181 assert_nil Message.find_by_id(2)
158 182 end
159 183
160 184 def test_quote
161 185 @request.session[:user_id] = 2
162 186 xhr :get, :quote, :board_id => 1, :id => 3
163 187 assert_response :success
164 188 assert_select_rjs :show, 'reply'
165 189 end
166 190
167 191 def test_preview_new
168 192 @request.session[:user_id] = 2
169 193 post :preview,
170 194 :board_id => 1,
171 195 :message => {:subject => "", :content => "Previewed text"}
172 196 assert_response :success
173 197 assert_template 'common/_preview'
174 198 end
175 199
176 200 def test_preview_edit
177 201 @request.session[:user_id] = 2
178 202 post :preview,
179 203 :id => 4,
180 204 :board_id => 1,
181 205 :message => {:subject => "", :content => "Previewed text"}
182 206 assert_response :success
183 207 assert_template 'common/_preview'
184 208 end
185 209 end
General Comments 0
You need to be logged in to leave comments. Login now