jro_apps/redmine Commit - r36:3628515b312c

git-svn-id: http://redmine.rubyforge.org/svn/trunk@38 e93f8b46-1217-0410-a6f0-8f06a7374b81

Jean-Philippe Lang -

r36:3628515b312c

parent child

Context file:

r36:3628515b312c

Expand all files

redmine/app/views/mailer/issue_add_note_de.rhtml created 644 +3 0

@@ -0,0 +1,3
	1	Note added to issue #<%= @history.issue_id %> by <%= @history.author.name %>
	2	----------------------------------------
	3	<%= @history.notes %> No newline at end of file

redmine/app/views/mailer/issue_add_note_en.rhtml created 644 +3 0

@@ -0,0 +1,3
	1	Note added to issue #<%= @history.issue_id %> by <%= @history.author.name %>
	2	----------------------------------------
	3	<%= @history.notes %> No newline at end of file

redmine/app/views/mailer/issue_add_note_es.rhtml created 644 +3 0

@@ -0,0 +1,3
	1	Note added to issue #<%= @history.issue_id %> by <%= @history.author.name %>
	2	----------------------------------------
	3	<%= @history.notes %> No newline at end of file

redmine/app/views/mailer/issue_add_note_fr.rhtml created 644 +3 0

@@ -0,0 +1,3
	1	Note ajoutée à la demande #<%= @history.issue_id %> par <%= @history.author.name %>
	2	----------------------------------------
	3	<%= @history.notes %> No newline at end of file

redmine/app/views/projects/activity.rhtml created 644 +43 0

@@ -0,0 +1,43
	1	<h2><%=l(:label_activity)%></h2>
	2
	3	<div>
	4	<div class="rightbox">
	5	<%= start_form_tag %>
	6	<p>From <%= text_field_tag 'date_from', @date_from, :size => 10, :class => 'button-small' %>
	7	and <%= text_field_tag 'days_back', @days_back, :size => 2, :class => 'button-small' %> days back</p>
	8	<%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0 %> <%=l(:label_issue_plural)%><br />
	9	<%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0 %> <%=l(:label_news_plural)%><br />
	10	<%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0 %> <%=l(:label_attachment_plural)%><br />
	11	<%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0 %> <%=l(:label_document_plural)%><br />
	12	<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
	13	<%= end_form_tag %>
	14	</div>
	15	<% @events_by_day.keys.sort {\|x,y\| y <=> x }.each do \|day\| %>
	16	<h3><%= format_date(day) %></h3>
	17	<ul>
	18	<% @events_by_day[day].each do \|e\| %>
	19	<li><p>
	20	<% if e.is_a? Issue %>
	21	<%= e.created_on.strftime("%H:%M") %> <%= e.tracker.name %> <%= link_to e.long_id, :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%= e.subject %><br />
	22	<i><%= e.author.name %></i>
	23	<% elsif e.is_a? News %>
	24	<%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to e.title, :controller => 'news', :action => 'show', :id => e %><br />
	25	<% unless e.summary.empty? %><%= e.summary %><br /><% end %>
	26	<i><%= e.author.name %></i>
	27	<% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
	28	<%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%> (Version <%= e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
	29	<i><%= e.author.name %></i>
	30	<% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
	31	<%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to e.container.title, :controller => 'documents', :action => 'show', :id => e %><br />
	32	<i><%= e.author.name %></i>
	33	<% end %>
	34	</p></li>
	35
	36	<% end %>
	37	</ul>
	38	<% end %>
	39	<br />
	40
	41
	42
	43	</div> No newline at end of file

redmine/app/controllers/issues_controller.rb +1 0

                   @history.status = @issue.status
                   if @history.save
                     flash[:notice] = l(:notice_successful_update)
+                    Mailer.deliver_issue_add_note(@history) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end

redmine/app/controllers/projects_controller.rb +42 0

@@ -356,6 +356,48 class ProjectsController < ApplicationController
356	@fixed_issues \|\|= []	356	@fixed_issues \|\|= []
357	end	357	end
358		358
		359	def activity
		360	@date_from = begin
		361	params[:date_from].to_date
		362	rescue
		363	end \|\| Date.today
		364	@days_back = params[:days_back] ? params[:days_back].to_i : 15
		365	@date_to = @date_from - @days_back
		366	@events_by_day = {}
		367
		368	unless params[:show_issues] == "0"
		369	@project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on<=? and issues.created_on>=?", @date_from+1, @date_to], :order => "issues.created_on asc" ).each { \|i\|
		370	@events_by_day[i.created_on.to_date] \|\|= []
		371	@events_by_day[i.created_on.to_date] << i
		372	}
		373	@show_issues = 1
		374	end
		375
		376	unless params[:show_news] == "0"
		377	@project.news.find(:all, :conditions => ["news.created_on<=? and news.created_on>=?", @date_from+1, @date_to], :order => "news.created_on asc" ).each { \|i\|
		378	@events_by_day[i.created_on.to_date] \|\|= []
		379	@events_by_day[i.created_on.to_date] << i
		380	}
		381	@show_news = 1
		382	end
		383
		384	unless params[:show_files] == "0"
		385	Attachment.find(:all, :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on<=? and attachments.created_on>=?", @project.id, @date_from+1, @date_to], :order => "attachments.created_on asc" ).each { \|i\|
		386	@events_by_day[i.created_on.to_date] \|\|= []
		387	@events_by_day[i.created_on.to_date] << i
		388	}
		389	@show_files = 1
		390	end
		391
		392	unless params[:show_documentss] == "0"
		393	Attachment.find(:all, :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on<=? and attachments.created_on>=?", @project.id, @date_from+1, @date_to], :order => "attachments.created_on asc" ).each { \|i\|
		394	@events_by_day[i.created_on.to_date] \|\|= []
		395	@events_by_day[i.created_on.to_date] << i
		396	}
		397	@show_documents = 1
		398	end
		399
		400	end
359	private	401	private
360	# Find project of id params[:id]	402	# Find project of id params[:id]
361	# if not found, redirect to project list	403	# if not found, redirect to project list

redmine/app/helpers/custom_fields_helper.rb +1 -1

                 case custom_value.custom_field.field_format
                 when "date"
-                  l_date(custom_value.value.to_date) if custom_value.value
+                  custom_value.value.empty? ? "" : l_date(custom_value.value.to_date)
                 when "bool"
                   l_YesNo(custom_value.value == "1")
                 else

redmine/app/models/issue.rb +2 -2

               has_many :custom_values, :dependent => true, :as => :customized
               has_many :custom_fields, :through => :custom_values
-              validates_presence_of :subject, :description, :priority, :tracker, :author
+              validates_presence_of :subject, :description, :priority, :tracker, :author, :status
               validates_associated :custom_values, :on => :update
               # set default status for new issues
               def before_create
                 build_history
               end
               def long_id
                 "%05d" % self.id
               end

redmine/app/models/issue_history.rb +1 0

             class IssueHistory < ActiveRecord::Base
             	belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
             	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+            	belongs_to :issue
             	validates_presence_of :status
             end

redmine/app/models/issue_status.rb +5 -1

               validates_presence_of :name
               validates_uniqueness_of :name
-              validates_length_of :html_color, :is=>6
+              validates_length_of :html_color, :is => 6
               validates_format_of :html_color, :with => /^[a-f0-9]*$/i
+              def before_save
+                IssueStatus.update_all "is_default=false" if self.is_default?
+              end
               # Returns the default status for new issues
               def self.default
                 find(:first, :conditions =>["is_default=?", true])

redmine/app/models/mailer.rb +16 -8

               def issue_change_status(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
-                @from           = 'redmine@somenet.foo'
+                @from           = $RDM_MAIL_FROM
-                @subject        = "Issue ##{issue.id} has been updated"
+                @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
                 @body['issue']  = issue
               end
               def issue_add(issue)
                 # Sends to all project members
                 @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
-                @from           = 'redmine@somenet.foo'
+                @from           = $RDM_MAIL_FROM
-                @subject        = "Issue ##{issue.id} has been reported"
+                @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
                 @body['issue']  = issue
               end
+              def issue_add_note(history)
+                # Sends to all project members
+                @recipients     = history.issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
+                @from           = $RDM_MAIL_FROM
+                @subject        = "[#{history.issue.project.name} - #{history.issue.tracker.name} ##{history.issue.id}] #{history.issue.status.name} - #{history.issue.subject}"
+                @body['history']  = history
+              end
               def lost_password(token)
                 @recipients     = token.user.mail
-                @from           = 'redmine@somenet.foo'
+                @from           = $RDM_MAIL_FROM
-                @subject        = "redMine password"
+                @subject        = l(:mail_subject_lost_password)
                 @body['token']  = token
               end
               def register(token)
                 @recipients     = token.user.mail
-                @from           = 'redmine@somenet.foo'
+                @from           = $RDM_MAIL_FROM
-                @subject        = "redMine account activation"
+                @subject        = l(:mail_subject_register)
                 @body['token']  = token
               end
             end

redmine/app/views/issues/edit.rhtml +29 -1

@@ -23,4 +23,32
23	</div>	23	</div>
24	<%= f.hidden_field :lock_version %>	24	<%= f.hidden_field :lock_version %>
25	<%= submit_tag l(:button_save) %>	25	<%= submit_tag l(:button_save) %>
26	<% end %> No newline at end of file	26	<% end %>
		27
		28	<%= javascript_include_tag 'jstoolbar' %>
		29	<script type="text/javascript">
		30	//<![CDATA[
		31	jsToolBar.prototype.base_url = 'http://callmepep.org';
		32	jsToolBar.prototype.legend_msg = 'You can use the following shortcuts to format your text.';
		33	jsToolBar.prototype.elements.strong.title = 'Strong emphasis';
		34	jsToolBar.prototype.elements.em.title = 'Emphasis';
		35	jsToolBar.prototype.elements.ins.title = 'Inserted';
		36	jsToolBar.prototype.elements.del.title = 'Deleted';
		37	jsToolBar.prototype.elements.quote.title = 'Inline quote';
		38	jsToolBar.prototype.elements.code.title = 'Code';
		39	jsToolBar.prototype.elements.br.title = 'Line break';
		40	jsToolBar.prototype.elements.ul.title = 'Unordered list';
		41	jsToolBar.prototype.elements.ol.title = 'Ordered list';
		42	jsToolBar.prototype.elements.link.title = 'Link';
		43	jsToolBar.prototype.elements.link.href_prompt = 'URL?';
		44	jsToolBar.prototype.elements.link.hreflang_prompt = 'Language?';
		45
		46	if (document.getElementById) {
		47	if (document.getElementById('issue_description')) {
		48	var commentTb = new jsToolBar(document.getElementById('issue_description'));
		49	commentTb.draw();
		50	}
		51	}
		52
		53	//]]>
		54	</script> No newline at end of file

redmine/app/views/issues/show.rhtml +35 -17

@@ -6,25 +6,42
6	</div>	6	</div>
7		7
8	<div class="box">	8	<div class="box">
9	<p>	9	<table width="100%">
10	<b><%=l(:field_status)%> :</b> <%= @issue.status.name %> &nbsp &nbsp	10	<tr>
11	<b><%=l(:field_priority)%> :</b> <%= @issue.priority.name %> &nbsp &nbsp	11	<td width="15%"><b><%=l(:field_status)%> :</b></td><td width="35%"><%= @issue.status.name %></td>
12	<b><%=l(:field_assigned_to)%> :</b> <%= @issue.assigned_to ? @issue.assigned_to.display_name : "-" %> &nbsp &nbsp	12	<td width="15%"><b><%=l(:field_priority)%> :</b></td><td width="35%"><%= @issue.priority.name %></td>
13	<b><%=l(:field_category)%> :</b> <%= @issue.category ? @issue.category.name : "-" %>	13	</tr>
14	</p>	14	<tr>
15	<div class="tabular">	15	<td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
16	<p><label><%=l(:field_author)%> :</label> <%= link_to_user @issue.author %> </p>	16	<td><b><%=l(:field_category)%> :</b></td><td><%= @issue.category ? @issue.category.name : "-" %></td>
17	<p><label><%=l(:field_created_on)%> :</label> <%= format_date(@issue.created_on) %> </p>	17	</tr>
18	<p><label><%=l(:field_subject)%> :</label> <%= @issue.subject %> </p>	18	<tr>
19	<%= simple_format ("<label>" + l(:field_description) + ": </label>" + auto_link(@issue.description)) %>	19	<td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
20	<p><label><%=l(:field_due_date)%> :</label> <%= format_date(@issue.due_date) %> </p>	20	<td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
		21	</tr>
		22	<tr>
		23	<td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
		24	<td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
		25	</tr>
		26	<tr>
		27	<% n = 0
		28	for custom_value in @custom_values %>
		29	<td><b><%= custom_value.custom_field.name %> :</b></td><td><%= show_value custom_value %></td>
		30	<% n = n + 1
		31	if (n > 1)
		32	n = 0 %>
		33	</tr><tr>
		34	<%end
		35	end %>
		36	</tr>
		37	</table>
		38	<hr />
		39	<br />
21		40
22	<% for custom_value in @custom_values %>	41	<b><%=l(:field_description)%> :</b><br /><br />
23	<p><label><%= custom_value.custom_field.name %> :</label> <%= show_value custom_value %></p>	42	<%= textilize @issue.description %>
24	<% end %>
25
26	</div>
27		43
		44	<p>
28	<% if authorize_for('issues', 'edit') %>	45	<% if authorize_for('issues', 'edit') %>
29	<%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>	46	<%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
30	<%= submit_tag l(:button_edit) %>	47	<%= submit_tag l(:button_edit) %>
@@ -57,6 +74,7
57	<%= end_form_tag %>	74	<%= end_form_tag %>
58		75
59	<% end %>	76	<% end %>
		77	</p>
60	</div>	78	</div>
61		79
62	<% if authorize_for('issues', 'add_note') %>	80	<% if authorize_for('issues', 'add_note') %>

redmine/app/views/layouts/base.rhtml +3 0

             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
+            <%= stylesheet_link_tag 'jstoolbar' %>
             <script type='text/javascript'>
             var menu_contenu=' \
             <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \
             <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
             <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
+            <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
+            				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>

redmine/app/views/projects/changelog.rhtml +8 -6

             <h2><%=l(:label_change_log)%></h2>
+            <div>
+            <div class="rightbox" style="width:140px;">
             <%= start_form_tag %>
+            <strong><%=l(:label_tracker_plural)%></strong><br />
             <% @trackers.each do |tracker| %>
               <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-              <%= tracker.name %>
+              <%= tracker.name %><br />
             <% end %>
-            &nbsp;&nbsp;<%= submit_tag l(:button_apply), :class => 'button-small' %>
+            <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-            <%= end_form_tag %><br />
+            <%= end_form_tag %>
-            &nbsp;
+            </div>
-            <div class="box">
             <% ver_id = nil
                @fixed_issues.each do |issue| %>
                 <% unless ver_id == issue.fixed_version_id %>
                 end %>
                 <li><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%= issue.subject %></li>
             <% end %>
             </div>

redmine/config/config_custom.rb +3 0

             # Default langage ('en', 'es', 'fr' are available)
             # $RDM_DEFAULT_LANG = 'en'
+            # Email adress used to send mail notifications
+            # $RDM_MAIL_FROM = "redmine@somenet.foo"
             # Page title
             # $RDM_HEADER_TITLE = "Title"

redmine/config/environment.rb +2 0

             $RDM_LOGIN_REQUIRED ||= false
             # default langage
             $RDM_DEFAULT_LANG ||= 'en'
+            # email sender adress
+            $RDM_MAIL_FROM ||= "redmine@somenet.foo"
             # page title
             $RDM_HEADER_TITLE ||= "redMine"

redmine/db/migrate/002_issue_move.rb +1 -1

             class IssueMove < ActiveRecord::Migration
               def self.up
-                Permission.create :controller => "projects", :action => "move_issues", :description => "button_move", :sort => 1061, :mail_option => 1, :mail_enabled => 0
+                Permission.create :controller => "projects", :action => "move_issues", :description => "button_move", :sort => 1061, :mail_option => 0, :mail_enabled => 0
               end
               def self.down

redmine/lang/de.yml +3 0

             notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
             notice_locking_conflict: Data have been updated by another user.
+            #mail_subject_lost_password: Your redMine password
+            #mail_subject_register: redMine account activation
             gui_validation_error: 1 Störung
             gui_validation_error_plural: %d Störungen

redmine/lang/en.yml +3 0

             notice_file_not_found: Requested file doesn't exist or has been deleted.
             notice_locking_conflict: Data have been updated by another user.
+            mail_subject_lost_password: Your redMine password
+            mail_subject_register: redMine account activation
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors

redmine/lang/es.yml +3 0

             notice_file_not_found: Requested file doesn't exist or has been deleted.
             notice_locking_conflict: Data have been updated by another user.
+            #mail_subject_lost_password: Your redMine password
+            #mail_subject_register: redMine account activation
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errores

redmine/lang/fr.yml +3 0

             notice_file_not_found: Le fichier demandé n'existe pas ou a été supprimé.
             notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
+            mail_subject_lost_password: Votre mot de passe redMine
+            mail_subject_register: Activation de votre compte redMine
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs

redmine/public/stylesheets/application.css +9 0

@@ -370,6 +370,15 color:#505050;
370	line-height:1.5em;	370	line-height:1.5em;
371	}	371	}
372		372
		373	.rightbox{
		374	background: #fafbfc;
		375	border: 1px solid #c0c0c0;
		376	float: right;
		377	padding: 8px;
		378	position: relative;
		379	margin: 0 5px 5px;
		380	}
		381
373	.topright{	382	.topright{
374	position: absolute;	383	position: absolute;
375	right: 25px;	384	right: 25px;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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