jro_apps/redmine Commit - r18:54aeec7b5fcf

custom field tags...

Jean-Philippe Lang -

r18:54aeec7b5fcf

parent child

Context file:

r18:54aeec7b5fcf

Collapse all files

redmine/app/controllers/projects_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField::find_all
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
-                @custom_values = ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
+                @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Delete @project
               def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
               end
               # Add a new issue category to @project
               def add_issue_category
                 if request.post?
                   @issue_category = @project.issue_categories.build(params[:issue_category])
                   if @issue_category.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post?
                   if @member.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_documents', :id => @project
                   end
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Create the document if a file was sent
                   if params[:attachment][:file].size > 0
                     @attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   end
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
                     redirect_to :action => 'list_issues', :id => @project
                   end
                 end
               end
               # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 search_filter_update if params[:set_filter] or request.post?
                 @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                 @issues = Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause
                 export = StringIO.new
                 CSV::Writer.generate(export, ',') do |csv|
                   csv << %w(Id Status Tracker Subject Author Created Updated)
                   @issues.each do |issue|
                     csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                   end
                 end
                 export.rewind
                 send_data(export.read,
                   :type => 'text/csv; charset=utf-8; header=present',
                   :filename => 'export.csv')
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
               end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue
                 redirect_to :action => 'list'
               end
             end

redmine/app/helpers/application_helper.rb +15 -5

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
-              # return current logged in user or nil
+              # Return current logged in user or nil
               def loggedin?
                 @logged_in_user
               end
-              # return true if user is loggend in and is admin, otherwise false
+              # Return true if user is logged in and is admin, otherwise false
               def admin_loggedin?
                 @logged_in_user and @logged_in_user.admin?
               end
+              # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 # check if action is allowed on public projects
                 if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project.id)  )  )
                   return true
                 end
                 return false
               end
               # Display a link if user is authorized
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
               end
               # Display a link to user's account page
               def link_to_user(user)
                 link_to user.display_name, :controller => 'account', :action => 'show', :id => user
               end
               def format_date(date)
                 l_date(date) if date
               end
               def format_time(time)
                 l_datetime(time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html =''
                 html << link_to(('&#171; ' + l(:label_previous) ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
                 html << (pagination_links(paginator, options, html_options) || '')
                 html << ' ' + link_to((l(:label_next) + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
                 html
               end
               def error_messages_for(object_name, options = {})
                 options = options.symbolize_keys
                 object = instance_variable_get("@#{object_name}")
                 if object && !object.errors.empty?
                   # build full_messages here with controller current language
                   full_messages = []
                   object.errors.each do |attr, msg|
                     next if msg.nil?
                     if attr == "base"
                       full_messages << l(msg)
                     else
-                      full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg)
+                      full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
                     end
                   end
+                  # retrieve custom values error messages
+                  if object.errors[:custom_values]
+                    object.custom_values.each do |v|
+                      v.errors.each do |attr, msg|
+                        next if msg.nil?
+                        full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
+                      end
+                    end
+                  end
                   content_tag("div",
                     content_tag(
-                      options[:header_tag] || "h2", lwr(:gui_validation_error, object.errors.count) + " :"
+                      options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
                     ) +
                     content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
                     "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
                   )
                 else
                   ""
                 end
               end
               def lang_options_for_select
                 (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
               end
             end

redmine/app/helpers/custom_fields_helper.rb +10 -7

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module CustomFieldsHelper
+              # Return custom field html tag corresponding to its format
               def custom_field_tag(custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "custom_fields[#{custom_field.id}]"
                 field_id = "custom_fields_#{custom_field.id}"
                 case custom_field.field_format
                 when "string", "int", "date"
-                  text_field_tag field_name, custom_value.value, :id => field_id
+                  text_field 'custom_value', 'value', :name => field_name, :id => field_id
                 when "text"
-                  text_area_tag field_name, custom_value.value, :id => field_id, :cols => 60, :rows => 3
+                  text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
                 when "bool"
-                  check_box_tag(field_name, "1", custom_value.value == "1", :id => field_id) +
+                  check_box 'custom_value', 'value', :name => field_name, :id => field_id
-                  hidden_field_tag(field_name, "0")
                 when "list"
-                  select_tag field_name,
+                  select 'custom_value', 'value', custom_field.possible_values.split('|'), { :include_blank => true }, :name => field_name, :id => field_id
-                              "<option></option>" + options_for_select(custom_field.possible_values.split('|'),
-                              custom_value.value), :id => field_id
                 end
               end
+              # Return custom field label tag
               def custom_field_label_tag(custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "custom_fields_#{custom_value.custom_field.id}"
               end
+              # Return custom field tag with its label tag
               def custom_field_tag_with_label(custom_value)
                 case custom_value.custom_field.field_format
                 when "bool"
+                  # label is displayed inline after the checkbox
                   custom_field_tag(custom_value) + " " + custom_field_label_tag(custom_value)
                 else
                   custom_field_label_tag(custom_value) + "<br />" + custom_field_tag(custom_value)
                 end
               end
+              # Return a string used to display a custom value
               def show_value(custom_value)
                 case custom_value.custom_field.field_format
                 when "bool"
                   l_YesNo(custom_value.value == "1")
                 else
                   custom_value.value
                 end
               end
+              # 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 ] }
               end
             end

redmine/app/models/custom_value.rb +7 -12

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               belongs_to :customized, :polymorphic => true
             protected
               def validate
-                # errors are added to customized object unless it's nil
+                errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?
-                object = customized || self
+                errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.empty? or value =~ Regexp.new(custom_field.regexp)
+                errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
-                object.errors.add(custom_field.name, :activerecord_error_blank) if custom_field.is_required? and value.empty?
+                errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
-                object.errors.add(custom_field.name, :activerecord_error_invalid) unless custom_field.regexp.empty? or value =~ Regexp.new(custom_field.regexp)
-                object.errors.add(custom_field.name, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
-                object.errors.add(custom_field.name, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
                 case custom_field.field_format
                 when "int"
-                  object.errors.add(custom_field.name, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/
+                  errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/
                 when "date"
-                  object.errors.add(custom_field.name, :activerecord_error_invalid) unless value =~ /^(\d+)\/(\d+)\/(\d+)$/ or value.empty?
+                  errors.add(:value, :activerecord_error_invalid) unless value =~ /^(\d+)\/(\d+)\/(\d+)$/ or value.empty?
                 when "list"
-                  object.errors.add(custom_field.name, :activerecord_error_inclusion) unless custom_field.possible_values.split('|').include? value or value.empty?
+                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.split('|').include? value or value.empty?
                 end
               end
             end

redmine/app/views/account/register.rhtml +2 -2

             <h2><%=l(:label_register)%></h2>
             <%= start_form_tag %>
             <%= error_messages_for 'user' %>
             <div class="box">
             <!--[form:user]-->
             <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'login', :size => 25  %></p>
             <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'firstname'  %></p>
             <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'lastname'  %></p>
             <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'mail'  %></p>
             <p><label for="user_language"><%=l(:field_language)%></label><br/>
             <%= select("user", "language", lang_options_for_select) %></p>
-            <% for custom_value in @custom_values %>
+            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label custom_value %></p>
+            	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
             <!--[eoform:user]-->
             </div>
             <%= submit_tag l(:button_submit) %>
             <%= end_form_tag %>

redmine/app/views/issues/edit.rhtml +2 -2

             <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <%= error_messages_for 'issue' %>
             <%= start_form_tag :action => 'edit', :id => @issue %>
             <div class="box">
             <!--[form:issue]-->
             <p><%=l(:field_status)%>: <b><%= @issue.status.name %></b></p>
             <div style="float:left;margin-right:10px;">
             <p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br/>
             <select name="issue[priority_id]">
             <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
             </select></p>
             </div>
             <div style="float:left;margin-right:10px;">
             <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br/>
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
             </select></p>
             </div>
             <div>
             <p><label for="issue_category_id"><%=l(:field_category)%></label><br/>
             <select name="issue[category_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %></p>
             </select></p>
             </div>
             <p><label for="issue_subject"><%=l(:field_subject)%></label><span class="required">*</span><br/>
             <%= text_field 'issue', 'subject', :size => 60  %></p>
             <p><label for="issue_description"><%=l(:field_description)%></label><span class="required">*</span><br/>
             <%= text_area 'issue', 'description', :cols => 60, :rows => 10  %></p>
             <p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
             <%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
-            <% for custom_value in @custom_values %>
+            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label custom_value %></p>
+            	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label><br/>
             <select name="issue[fixed_version_id]">
             <option value="">--none--</option>
             <%= options_from_collection_for_select @project.versions, "id", "name", @issue.fixed_version_id %>
             </select></p>
             <!--[eoform:issue]-->
             </div>
             <%= submit_tag l(:button_save) %>
             <%= end_form_tag %>

redmine/app/views/projects/_form.rhtml +2 -2

             <%= error_messages_for 'project' %>
             <div class="box">
             <!--[form:project]-->
             <p><label for="project_name"><%=l(:field_name)%> <span class="required">*</span></label><br/>
             <%= text_field 'project', 'name'  %></p>
             <% if admin_loggedin? %>
             <p><label for="project_parent_id"><%=l(:field_parent)%></label><br/>
             <select name="project[parent_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @root_projects, "id", "name", @project.parent_id %>
             </select></p>
             <% end %>
             <p><label for="project_description"><%=l(:field_description)%> <span class="required">*</span></label><br/>
             <%= text_area 'project', 'description', :cols => 60, :rows => 3 %></p>
             <p><label for="project_homepage"><%=l(:field_homepage)%></label><br/>
             <%= text_field 'project', 'homepage', :size => 40 %></p>
             <p><%= check_box 'project', 'is_public' %>
             <label for="project_is_public"><%=l(:field_is_public)%></label></p>
-            <% for custom_value in @custom_values %>
+            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label custom_value %></p>
+            	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <fieldset><legend><%=l(:label_custom_field_plural)%></legend>
             <% for custom_field in @custom_fields %>
             	<input type="checkbox"
             	name="custom_field_ids[]"
             	value="<%= custom_field.id %>"
             	<%if @project.custom_fields.include? custom_field%>checked="checked"<%end%>
             	> <%= custom_field.name %>
             <% end %></fieldset>
             </div>
             <!--[eoform:project]-->

redmine/app/views/projects/add_issue.rhtml +2 -2

             <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
             <%= start_form_tag( { :action => 'add_issue', :id => @project }, :multipart => true) %>
             <%= error_messages_for 'issue' %>
             <div class="box">
             <!--[form:issue]-->
             <%= hidden_field_tag 'tracker_id', @tracker.id %>
             <div style="float:left;margin-right:10px;">
             <p><label for="issue_priority_id"><%=l(:field_priority)%> <span class="required">*</span></label><br />
             <select name="issue[priority_id]">
             <%= options_from_collection_for_select @priorities, "id", "name", @issue.priority_id %></p>
             </select></p>
             </div>
             <div style="float:left;margin-right:10px;">
             <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label><br />
             <select name="issue[assigned_to_id]">
             <option value=""></option>
             <%= options_from_collection_for_select @issue.project.members, "user_id", "name", @issue.assigned_to_id %></p>
             </select></p>
             </div>
             <div>
             <p><label for="issue_category_id"><%=l(:field_category)%></label><br />
             <select name="issue[category_id]">
             <option value=""></option><%= options_from_collection_for_select @project.issue_categories, "id", "name", @issue.category_id %>
             </select></p>
             </div>
             <p><label for="issue_subject"><%=l(:field_subject)%> <span class="required">*</span></label><br />
             <%= text_field 'issue', 'subject', :size => 80  %></p>
             <p><label for="issue_description"><%=l(:field_description)%> <span class="required">*</span></label><br />
             <%= text_area 'issue', 'description', :cols => 60, :rows => 10 %></p>
             <p><label for="issue_due_date"><%=l(:field_due_date)%></label><br />
             <%= date_select 'issue', 'due_date', :start_year => Date.today.year, :include_blank => true %></p>
-            <% for custom_value in @custom_values %>
+            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label custom_value %></p>
+            	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <p><label for="attachment_file"><%=l(:label_attachment)%></label><br />
             <%= file_field 'attachment', 'file'  %></p>
             <!--[eoform:issue]-->
             </div>
             <%= submit_tag l(:button_create) %>
             <%= end_form_tag %>

redmine/app/views/users/_form.rhtml +2 -2

             <%= error_messages_for 'user' %>
             <div class="box">
             <!--[form:user]-->
             <p><label for="user_login"><%=l(:field_login)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'login', :size => 25  %></p>
             <p><label for="password"><%=l(:field_password)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password', nil, :size => 25  %></p>
             <p><label for="password_confirmation"><%=l(:field_password_confirmation)%></label> <span class="required">*</span><br/>
             <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             <p><label for="user_firstname"><%=l(:field_firstname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'firstname'  %></p>
             <p><label for="user_lastname"><%=l(:field_lastname)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'lastname'  %></p>
             <p><label for="user_mail"><%=l(:field_mail)%></label> <span class="required">*</span><br/>
             <%= text_field 'user', 'mail'  %></p>
             <p><label for="user_language"><%=l(:field_language)%></label><br/>
             <%= select("user", "language", lang_options_for_select) %></p>
-            <% for custom_value in @custom_values %>
+            <% for @custom_value in @custom_values %>
-            	<p><%= custom_field_tag_with_label custom_value %></p>
+            	<p><%= custom_field_tag_with_label @custom_value %></p>
             <% end %>
             <div style="clear: both;"></div>
             <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=l(:field_admin)%></label></p>
             <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=l(:field_mail_notification)%></label></p>
             <!--[eoform:user]-->
             </div>

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