jro_apps/redmine Commit - r1466:5d2abb84bdcb

0

public/images/comment.png created 644 binary 0 0

1

NO CONTENT: new file 100644, binary diff hidden

0

app/controllers/issues_controller.rb +21 -1

@@ -19,7 +19,7 class IssuesController < ApplicationController
19	layout 'base'	19	layout 'base'
20	menu_item :new_issue, :only => :new	20	menu_item :new_issue, :only => :new
21		21
22	before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]	22	before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
23	before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]	23	before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
24	before_filter :find_project, :only => [:new, :update_form, :preview]	24	before_filter :find_project, :only => [:new, :update_form, :preview]
25	before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]	25	before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
@@ -208,6 +208,26 class IssuesController < ApplicationController
208	flash.now[:error] = l(:notice_locking_conflict)	208	flash.now[:error] = l(:notice_locking_conflict)
209	end	209	end
210		210
		211	def reply
		212	journal = Journal.find(params[:journal_id]) if params[:journal_id]
		213	if journal
		214	user = journal.user
		215	text = journal.notes
		216	else
		217	user = @issue.author
		218	text = @issue.description
		219	end
		220	content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
		221	content << text.to_s.strip.gsub(%r{<pre>((.\|\s)*?)</pre>}m, '[...]').gsub("\n", "\n> ") + "\n\n"
		222	render(:update) { \|page\|
		223	page.replace_html "notes", content
		224	page.show 'update'
		225	page << "Form.Element.focus('notes');"
		226	page << "Element.scrollTo('update');"
		227	page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
		228	}
		229	end
		230
211	# Bulk edit a set of issues	231	# Bulk edit a set of issues
212	def bulk_edit	232	def bulk_edit
213	if request.post?	233	if request.post?

0

app/helpers/journals_helper.rb +7 -4

               def render_notes(journal, options={})
                 content = ''
                 editable = journal.editable_by?(User.current)
-                if editable && !journal.notes.blank?
+                links = []
-                  links = []
+                if !journal.notes.blank?
                   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))
+                                                            :title => l(:button_edit)) if editable
-                  content << content_tag('div', links.join(' '), :class => 'contextual')
+                  links << link_to_remote(image_tag('comment.png'),
+                                          { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
+                                          :title => l(:button_reply)) if options[:reply_links]
                 end
+                content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
                 content << textilizable(journal, :notes)
                 content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
               end

0

app/views/issues/_history.rhtml +2 -1

+            <% reply_links = authorize_for('issues', 'edit') -%>
             <% for journal in journals %>
                 <div id="change-<%= journal.id %>" class="journal">
             	<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
             	   <li><%= show_detail(detail) %></li>
             	<% end %>
             	</ul>
-            	<%= render_notes(journal) unless journal.notes.blank? %>
+            	<%= render_notes(journal, :reply_links => reply_links) unless journal.notes.blank? %>
             	</div>
             <% end %>

0

app/views/issues/show.rhtml +6 0

             </table>
             <hr />
+            <div class="contextual">
+            <%= link_to_remote(image_tag('comment.png'),
+                               { :url => {:controller => 'issues', :action => 'reply', :id => @issue} },
+                               :title => l(:button_reply)) if authorize_for('issues', 'edit') %>
+            </div>
             <p><strong><%=l(:field_description)%></strong></p>
             <div class="wiki">
             <%= textilizable @issue, :description, :attachments => @issue.attachments %>

0

lang/bg.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/cs.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/da.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/de.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/en.yml +1 0

             text_destroy_time_entries: Delete reported hours
             text_assign_time_entries_to_project: Assign reported hours to the project
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
+            text_user_wrote: '%s wrote:'
             default_role_manager: Manager
             default_role_developper: Developer

0

lang/es.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/fi.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/fr.yml +1 0

             text_destroy_time_entries: Supprimer les heures
             text_assign_time_entries_to_project: Reporter les heures sur le projet
             text_reassign_time_entries: 'Reporter les heures sur cette demande:'
+            text_user_wrote: '%s a écrit:'
             default_role_manager: Manager
             default_role_developper: Développeur

0

lang/he.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/hu.yml +1 0

             enumeration_activities: Tevékenységek (idő rögzítés)
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/it.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/ja.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/ko.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/lt.yml +1 0

             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/nl.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/no.yml +1 0

             enumeration_activities: Aktiviteter (tidssporing)
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/pl.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/pt-br.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/pt.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/ro.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/ru.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/sr.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/sv.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/th.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/uk.yml +1 0

             label_and_its_subprojects: %s and its subprojects
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/zh-tw.yml +1 0

             enumeration_activities: 活動 (時間追蹤)
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
             mail_subject_reminder: "%d issue(s) due in the next days"
+            text_user_wrote: '%s wrote:'

0

lang/zh.yml +1 0

             enumeration_activities: 活动（时间跟踪）
             mail_subject_reminder: "%d issue(s) due in the next days"
             mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+            text_user_wrote: '%s wrote:'

0

lib/redmine.rb +2 -2

                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:issues => :new}
-                map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
+                map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit, :destroy_attachment]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
-                map.permission :add_issue_notes, {:issues => :edit}
+                map.permission :add_issue_notes, {:issues => [:edit, :reply]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => :move}, :require => :loggedin

0

test/functional/issues_controller_test.rb +16 0

@@ -263,6 +263,22 class IssuesControllerTest < Test::Unit::TestCase
263	:content => 'Urgent',	263	:content => 'Urgent',
264	:attributes => { :selected => 'selected' } }	264	:attributes => { :selected => 'selected' } }
265	end	265	end
		266
		267	def test_reply_to_issue
		268	@request.session[:user_id] = 2
		269	get :reply, :id => 1
		270	assert_response :success
		271	assert_select_rjs :show, "update"
		272	assert_select_rjs :replace_html, "notes"
		273	end
		274
		275	def test_reply_to_note
		276	@request.session[:user_id] = 2
		277	get :reply, :id => 1, :journal_id => 2
		278	assert_response :success
		279	assert_select_rjs :show, "update"
		280	assert_select_rjs :replace_html, "notes"
		281	end
266		282
267	def test_post_edit	283	def test_post_edit
268	@request.session[:user_id] = 2	284	@request.session[:user_id] = 2

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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