changeset_journals_v1.diff - Redmine

     class JournalObserver < ActiveRecord::Observer
       def after_create(journal)
         Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
         case(journal.journalized_type)
         when 'Issue':
           Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
         when 'ChangeSet':
           # notifty revision commiter
           Mailer.deliver_changeset_comment(journal) if Setting.notified_events.include?('revision_comment_added')
         end
       end
     end

              :journal => journal,
              :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
       end
       def changeset_comment(journal)
         changeset = journal.journalized.reload
         redmine_headers 'Project'  => changeset.repository.project.identifier,
                         'Revision' => changeset.revision
         message_id journal
         references changeset
         @author = journal.user
         recipients changeset.recipients
         subject "[#{changeset.repository.project.name}] #{l(:label_revision)} #{changeset.revision}"
         body :changeset => changeset,
              :journal   => journal,
              :changeset_url => url_for(:controller => 'projects') + "/#{changeset.repository.project.identifier}/repository/revisions/#{changeset.revision}"
       end
       def reminder(user, issues, days)
         set_language_if_valid user.language

       belongs_to :repository
       belongs_to :user
       has_many :changes, :dependent => :delete_all
       has_many :journals, :as => :journalized, :dependent => :destroy
       has_and_belongs_to_many :issues
       acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.short_comments.blank? ? '' : (': ' + o.short_comments))},
-...
         to_utf8(str.to_s.strip)
       end
       # Returns the mail adresses of users that should be notified for the changeset
       # Includes: project recipients, the revision commiter, and other users who have commented
       def recipients
         recipients = repository.project.recipients
         recipients << user.mail if user && user.active? # committer
         recipients << journals.collect { |j| j.user.mail if j.user } # other commenters
         recipients.compact.uniq
       end
       def created_on
         self.committed_on
       end
       private
       def split_comments

       def revision
         @changeset = @repository.changesets.find_by_revision(@rev)
         raise ChangesetNotFound unless @changeset
         @journal = @changeset.journals.new
         @journals = @changeset.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
         @journals.each_with_index {|j,i| j.indice = i+1}
         @journals.reverse! if User.current.wants_comments_in_reverse_order?
         respond_to do |format|
           format.html
           format.js {render :layout => false}
-...
         show_error_not_found
       end
       def add_journal
         @changeset = @repository.changesets.find_by_revision(@rev)
         @journal = @changeset.journals.new(params[:journal])
         @journal.user = User.current
         respond_to do |format|
           if @journal.save
             format.html { redirect_to :action => :revision }
           else
             format.html { redirect_to :action => :revision }
           end
         end
       end
       def diff
         if params[:format] == 'diff'
           @diff = @repository.diff(@path, @rev, @rev_to)

app/views/mailer/changeset_comment.text.plain.rhtml (revision 0)
	1	<%= l(:text_changeset_commented, :rev => "##{@changeset.revision}", :author => @journal.user) %>
	2
	3	<%= @journal.notes %>
	4
	5	<%= @changeset_url %>

app/views/mailer/changeset_comment.text.html.rhtml (revision 0)
	1	<%= l(:text_changeset_commented, :rev => "##{@changeset.revision}", :author => @journal.user) %>
	2
	3	<%= textilizable(@journal, :notes, :only_path => false) %>
	4
	5	<h1><%= link_to "#{@changeset.revision}", @changeset_url %></h1>

     <%= textilizable @changeset.comments %>
     <h3><%= l(:label_revision_comments) %></h3>
     <% 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>
         <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
     		<%= authoring journal.created_on, journal.user, :label => :label_comment_added_time_by %></h4>
         <%= avatar(journal.user, :size => "32") %>
         <%= textilizable journal.notes %>
       </div>
       <%#= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
     <% end %>
     <div class="box">
       <fieldset><legend><%= l(:label_comment_add) %></legend>
       <% form_for :journal, @journal, :url => {:action => 'add_journal', :id => @project, :rev => @rev} do |f| %>
         <%= f.text_area :notes, :cols => 60, :rows => 5, :class => 'wiki-edit' %><br />
         <%= f.submit l(:label_comment) %>
       <% end %>
       </fieldset>
     </div>
     <% if @changeset.issues.any? %>
     <h3><%= l(:label_related_issues) %></h3>
     <ul>

config/settings.yml (working copy)
114	114	default:
115	115	- issue_added
116	116	- issue_updated
	117	- revision_comment_added
117	118	mail_handler_api_enabled:
118	119	default: 0
119	120	mail_handler_api_key:

       label_modification_plural: "{{count}} changes"
       label_revision: Revision
       label_revision_plural: Revisions
       label_revision_comments: Revision Comments
       label_revision_comment_add: Comment on this Revision
       label_associated_revisions: Associated revisions
       label_added: added
       label_modified: modified
-...
       label_module_plural: Modules
       label_added_time_by: "Added by {{author}} {{age}} ago"
       label_updated_time_by: "Updated by {{author}} {{age}} ago"
       label_comment_added_time_by: "Comment added by {{author}} {{age}} ago"
       label_updated_time: "Updated {{value}} ago"
       label_jump_to_a_project: Jump to a project...
       label_file_plural: Files
-...
       text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
       text_issue_added: "Issue {{id}} has been reported by {{author}}."
       text_issue_updated: "Issue {{id}} has been updated by {{author}}."
       text_changeset_commented: "Revision {{rev}} has been commented on by {{author}}."
       text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
       text_issue_category_destroy_question: "Some issues ({{count}}) are assigned to this category. What do you want to do ?"
       text_issue_category_destroy_assignments: Remove category assignments

config/routes.rb (working copy)
222	222	repository_views.connect 'projects/:id/repository/:action/*path'
223	223	end
224	224
	225	repositories.connect 'projects/:id/repository/revisions/:rev/add_journal', :action => 'add_journal', :conditions => {:method => :post}
225	226	repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
226	227	end
227	228

config/environments/development.rb (working copy)
13	13	config.action_controller.perform_caching = false
14	14
15	15	# Don't care if the mailer can't send
16		config.action_mailer.raise_delivery_errors = false
	16	config.action_mailer.raise_delivery_errors = true

       map.project_module :repository do |map|
         map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
         map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
         map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
         map.permission :view_changesets, :repositories => [:show, :revisions, :revision, :add_journal]
         map.permission :commit_access, {}
       end

Project

General

Profile

Redmine

Feature #2048 » changeset_journals_v1.diff