jro_apps/redmine Commit - r97:918123cd0663

* code and views cleaning...

Jean-Philippe Lang -

r97:918123cd0663

parent child

Context file:

r97:918123cd0663

Collapse all files

app/controllers/projects_controller.rb +5 -2

                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
-                    # category is project dependent
+                    # project dependent properties
-                    i.category = nil unless i.project_id == new_project.id
+                    unless i.project_id == new_project.id
+                      i.category = nil
+                      i.fixed_version = nil
+                    end
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker

app/helpers/application_helper.rb +2 -1

               (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
+                  return super if options.delete :no_label
                   label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                   label = @template.content_tag("label", label_text,
                                 :class => (@object.errors[field] ? "error" : nil),
                 class_eval src, __FILE__, __LINE__
               end
-              def select(field, choices, options = {})
+              def select(field, choices, options = {}, html_options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 label = @template.content_tag("label", label_text,
                               :class => (@object.errors[field] ? "error" : nil),

app/helpers/custom_fields_helper.rb +1 -1

               # Return an array of custom field formats which can be used in select_tag
               def custom_field_formats_for_select
-                CustomField::FIELD_FORMATS.keys.collect { |k| [ l(CustomField::FIELD_FORMATS[k]), k ] }
+                CustomField::FIELD_FORMATS.sort {|a,b| a[1][:order]<=>b[1][:order]}.collect { |k| [ l(k[1][:name]), k[0] ] }
               end
             end

app/models/custom_field.rb +6 -6

             class CustomField < ActiveRecord::Base
               has_many :custom_values, :dependent => true
-              FIELD_FORMATS = { "list" => :label_list,
+              FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
-            			        "date" => :label_date,
+                                "text" => { :name => :label_text, :order => 2 },
-            			        "bool" => :label_boolean,
+                                "int" => { :name => :label_integer, :order => 3 },
-            			        "int" => :label_integer,
+                                "list" => { :name => :label_list, :order => 4 },
-            			        "string" => :label_string,
+            			        "date" => { :name => :label_date, :order => 5 },
-            			        "text" => :label_text
+            			        "bool" => { :name => :label_boolean, :order => 6 }
               }.freeze
               validates_presence_of :name, :field_format

app/views/account/show.rhtml +1 -1

                 <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
             <% for custom_value in @custom_values %>
             <% if !custom_value.value.empty? %>
-                <li><%= custom_value.custom_field.name%>: <%= show_value(custom_value) %></li>
+                <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             <% end %>
             <% end %>
             </ul>

app/views/custom_fields/_form.rhtml +57 -39

@@ -1,52 +1,70
1	<%= error_messages_for 'custom_field' %>	1	<%= error_messages_for 'custom_field' %>
2		2
		3	<script>
		4	function toggle_custom_field_format() {
		5	format = $("custom_field_field_format");
		6	p_length = $("custom_field_min_length");
		7	p_regexp = $("custom_field_regexp");
		8	p_values = $("custom_field_possible_values");
		9	switch (format.value) {
		10	case "list":
		11	Element.hide(p_length.parentNode);
		12	Element.hide(p_regexp.parentNode);
		13	Element.show(p_values.parentNode);
		14	break;
		15	case "int":
		16	case "string":
		17	case "text":
		18	Element.show(p_length.parentNode);
		19	Element.show(p_regexp.parentNode);
		20	Element.hide(p_values.parentNode);
		21	break;
		22	case "date":
		23	case "bool":
		24	Element.hide(p_length.parentNode);
		25	Element.hide(p_regexp.parentNode);
		26	Element.hide(p_values.parentNode);
		27	break;
		28	default:
		29	Element.show(p_length.parentNode);
		30	Element.show(p_regexp.parentNode);
		31	Element.show(p_values.parentNode);
		32	break;
		33	}
		34	}
		35	</script>
		36
3	<!--[form:custom_field]-->	37	<!--[form:custom_field]-->
4	<div class="box">	38	<div class="box">
5	<p><label for="custom_field_name"><%=l(:field_name)%><span class="required"> *</span></label>	39	<p><%= f.text_field :name, :required => true %></p>
6	<%= text_field 'custom_field', 'name' %></p>	40	<p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();" %></p>
7
8	<p><label for="custom_field_field_format"><%=l(:field_field_format)%></label>
9	<%= select("custom_field", "field_format", custom_field_formats_for_select) %></p>
10
11	<p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>	41	<p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
12	<%= text_field ~~'custom_field'~~, 'min_length', :size => 5 %> -	42	<%= f.text_field :min_length, :size => 5, :no_label => true %> -
13	<%= text_field ~~'custom_field'~~, 'max_length', :size => 5 %><br>(<%=l(:text_min_max_length_info)%>)</p>	43	<%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p>
14		44	<p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
15	<p><label for="custom_field_regexp"><%=l(:field_regexp)%></label>	45	<p><%= f.text_area :possible_values, :rows => 5, :cols => 60 %><br>(<%=l(:text_possible_values_info)%>)</p>
16	<%= text_field 'custom_field', 'regexp', :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
17
18	<p><label for="custom_field_possible_values"><%=l(:field_possible_values)%></label>
19	<%= text_area 'custom_field', 'possible_values', :rows => 5, :cols => 60 %><br>(<%=l(:text_possible_values_info)%>)</p>
20	</div>	46	</div>
		47	<%= javascript_tag "toggle_custom_field_format();" %>
21	<!--[eoform:custom_field]-->	48	<!--[eoform:custom_field]-->
22		49
23	<div class="box">	50	<div class="box">
24	<% case type.to_s	51	<% case @custom_field.type.to_s
25	when "IssueCustomField" %>	52	when "IssueCustomField" %>
26		53
27	<fieldset><legend><%=l(:label_tracker_plural)%></legend>	54	<fieldset><legend><%=l(:label_tracker_plural)%></legend>
28	<% for tracker in @trackers %>	55	<% for tracker in @trackers %>
29	<input type="checkbox"	56	<%= check_box_tag "tracker_ids[]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
30	name="tracker_ids[]"	57	<% end %>
31	value="<%= tracker.id %>"	58	</fieldset>
32	<%if @custom_field.trackers.include? tracker%>checked="checked"<%end%>	59
33	> <%= tracker.name %>	60	<p><%= f.check_box :is_required %></p>
34	<% end %></fieldset>	61	<p><%= f.check_box :is_for_all %></p>
35		62
36		63	<% when "UserCustomField" %>
37	<p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>	64	<p><%= f.check_box :is_required %></p>
38	<%= check_box 'custom_field', 'is_required' %></p>
39
40	<p><label for="custom_field_is_for_all"><%=l(:field_is_for_all)%></label>
41	<%= check_box 'custom_field', 'is_for_all' %></p>
42
43	<% when "UserCustomField" %>
44	<p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>
45	<%= check_box 'custom_field', 'is_required' %></p>
46		65
47	<% when "ProjectCustomField" %>	66	<% when "ProjectCustomField" %>
48	<p><label for="custom_field_is_required"><%=l(:field_is_required)%></label>	67	<p><%= f.check_box :is_required %></p>
49	<%= check_box 'custom_field', 'is_required' %></p>
50		68
51	<% end %>	69	<% end %>
52	</div>	70	</div>

app/views/custom_fields/edit.rhtml +4 -4

@@ -1,6 +1,6
1	<h2><%=l(:label_custom_field)%> (<%=l(@custom_field.type_name)%>)</h2>	1	<h2><%=l(:label_custom_field)%> (<%=l(@custom_field.type_name)%>)</h2>
2		2
3	<%= start_form_tag({:action => 'edit', :id => @custom_field}, :class => "tabular") %>	3	<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do \|f\| %>
4	<%= render :partial => 'form', :locals => { :~~type~~ => ~~@custom_~~f~~ield~~.~~type~~ } %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= submit_tag l(:button_save) %>	5	<%= submit_tag l(:button_save) %>
6	<%= end~~_form_tag~~ %>	6	<% end %>

app/views/custom_fields/list.rhtml +1 -1

               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             	<td align="center"><%= l(custom_field.type_name) %></td>
-            	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format]) %></td>
+            	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_required? %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>
             	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>

app/views/custom_fields/new.rhtml +5 -6

@@ -1,8 +1,7
1	<h2><%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)</h2>	1	<h2><%=l(:label_custom_field_new)%> (<%=l(@custom_field.type_name)%>)</h2>
2		2
3	<%= start_form_tag({:action => 'new'}, :class => "tabular") %>	3	<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do \|f\| %>
4	<%= render :partial => 'form', :locals => { :~~type~~ => ~~@custom_~~f~~ield~~.~~type~~ } %>	4	<%= render :partial => 'form', :locals => { :f => f } %>
5	<%= hidden_field_tag 'type', @custom_field.type %>	5	<%= hidden_field_tag 'type', @custom_field.type %>
6	<%= submit_tag l(:button_save) %>	6	<%= submit_tag l(:button_save) %>
7	<%= end~~_form_tag~~ %>	7	<% end %>
8

app/views/issues/show.rhtml +1 -1

               <%= submit_tag l(:button_change) %>
               <%= end_form_tag %>
             <% end %>
+            &nbsp;
             </div>
             <div id="history" class="box">

app/views/my/blocks/_documents.rhtml +1 0

             <%= render(:partial => 'documents/document',
                        :collection => Document.find(:all,
                                      :limit => 10,
+                                     :order => 'documents.created_on DESC',
                                      :conditions => "documents.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
                                      :include => [:project])) unless @user.projects.empty? %>

app/views/my/blocks/_latest_news.rhtml +1 0

             <%= render (:partial => 'news/news',
                         :collection => News.find(:all,
                                                  :limit => 10,
+                                                 :order => 'news.created_on DESC',
                                                  :conditions => "news.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
                                                  :include => [:project, :author])) unless @user.projects.empty? %>

app/views/projects/changelog.rhtml +2 -2

                @fixed_issues.each do |issue| %>
                 <% unless ver_id == issue.fixed_version_id %>
                 <% if ver_id %></ul><% end %>
-                <h3><%= l(:label_version) %>: <%= issue.fixed_version.name %></h3>
+                <h3><%= issue.fixed_version.name %></h3>
                 <p><%= format_date(issue.fixed_version.effective_date) %><br />
                 <%=h issue.fixed_version.description %></p>
                 <ul>
                 <% ver_id = issue.fixed_version_id
                 end %>
-                <li><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %> [<%= issue.tracker.name %>]: <%=h issue.subject %></li>
+                <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
             <% end %>
             </div>

app/views/projects/list_files.rhtml +1 -1

                 <% if delete_allowed %>
                 <td align="center">
                     <div class="contextual">
-                    <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
+                    <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
                     </div>
                 </td>
                 <% end %>

app/views/projects/move_issues.rhtml +1 -1

             <div class="box">
             <p><label><%= l(:label_issue_plural) %>:</label>
             <% for issue in @issues %>
-                <b><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></b> - <%= issue.subject %>
+                <b><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></b> - <%=h issue.subject %>
                 <%= hidden_field_tag "issue_ids[]", issue.id %><br />
             <% end %>
             <i>(<%= @issues.length%> <%= lwr(:label_issue, @issues.length)%>)</i></p>

app/views/projects/show.rhtml +1 -1

             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
-            	<%= simple_format(auto_link(h @project.description)) %>
+            	<%= simple_format(auto_link(h(@project.description))) %>
             	<ul>
             	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>

doc/CHANGELOG +3 0

             * comments can now be added on news
             * "my page" is now customizable
+            * more powerfull and savable filters for issues lists
             * improved issues change history
             * new functionality: move an issue to another project or tracker
             * new functionality: add a note to an issue
             * csv output encoded to ISO-8859-1
             * user custom field displayed on account/show
             * default configuration improved (default roles, trackers, status, permissions and workflows)
+            * javascript added on custom field form to show/hide fields according to the format of custom field
             * fixed: custom fields not in csv exports
             * fixed: project settings now displayed according to user's permissions
+            * fixed: application error when no version is selected on projects/add_file
             == 10/08/2006 v0.3.0

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