jro_apps/redmine Commit - r15589:5b5b751d8c0e

Show the entered value when it's not valid (#23996)....

Jean-Philippe Lang -

r15589:5b5b751d8c0e

parent child

Context file:

r15589:5b5b751d8c0e

Collapse all files

app/views/issues/_attributes.html.erb +1 -1

             <%= labelled_fields_for :issue, @issue do |f| %>
             <div class="splitcontent">
             <div class="splitcontentleft">
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
                             :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>
             <% end %>
             <% if @issue.safe_attribute? 'priority_id' %>
             <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true} %></p>
             <% end %>
             <% if @issue.safe_attribute? 'assigned_to_id' %>
             <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
             <% end %>
             <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
             <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true, :required => @issue.required_attribute?('category_id') %>
             <%= link_to(l(:label_issue_category_new),
                         new_project_issue_category_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_issue_category_new),
                         :tabindex => 200,
                         :class => 'icon-only icon-add'
                        ) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
             <% end %>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true, :required => @issue.required_attribute?('fixed_version_id') %>
             <%= link_to(l(:label_version_new),
                         new_project_version_path(@issue.project),
                         :remote => true,
                         :method => 'get',
                         :title => l(:label_version_new),
                         :tabindex => 200,
                         :class => 'icon-only icon-add'
                        ) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>
             <div class="splitcontentright">
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p>
             <%= javascript_tag "observeAutocompleteField('issue_parent_issue_id', '#{escape_javascript auto_complete_issues_path(:project_id => @issue.project, :scope => Setting.cross_project_subtasks)}')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>
             <p id="start_date_area">
               <%= f.date_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
               <%= calendar_for('issue_start_date') %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p id="due_date_area">
               <%= f.date_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
               <%= calendar_for('issue_due_date') %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'estimated_hours' %>
-            <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours'), :value => format_hours(@issue.estimated_hours) %> <%= l(:field_hours) %></p>
+            <p><%= f.hours_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
             <% end %>
             <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
             <% end %>
             </div>
             </div>
             <% if @issue.safe_attribute? 'custom_field_values' %>
             <%= render :partial => 'issues/form_custom_fields' %>
             <% end %>
             <% end %>
             <% include_calendar_headers_tags %>

app/views/issues/_edit.html.erb +1 -1

             <%= labelled_form_for @issue, :html => {:id => 'issue-form', :multipart => true} do |f| %>
                 <%= error_messages_for 'issue', 'time_entry' %>
                 <%= render :partial => 'conflict' if @conflict %>
                 <div class="box">
                 <% if @issue.attributes_editable? %>
                     <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
                     <div id="all_attributes">
                     <%= render :partial => 'form', :locals => {:f => f} %>
                     </div>
                     </fieldset>
                 <% end %>
                 <% if User.current.allowed_to?(:log_time, @project) %>
                     <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
                     <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
                     <div class="splitcontent">
                     <div class="splitcontentleft">
-                    <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time, :value => format_hours(@time_entry.hours) %> <%= l(:field_hours) %></p>
+                    <p><%= time_entry.hours_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
                     </div>
                     <div class="splitcontentright">
                     <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
                     </div>
                     </div>
                     <p><%= time_entry.text_field :comments, :size => 60 %></p>
                     <% @time_entry.custom_field_values.each do |value| %>
                       <p><%= custom_field_tag_with_label :time_entry, value %></p>
                     <% end %>
                     <% end %>
                 </fieldset>
                 <% end %>
                 <% if @issue.notes_addable? %>
                   <fieldset><legend><%= l(:field_notes) %></legend>
                   <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
                   <%= wikitoolbar_for 'issue_notes' %>
                   <% if @issue.safe_attribute? 'private_notes' %>
                   <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
                   <% end %>
                   <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
                   </fieldset>
                   <fieldset><legend><%= l(:label_attachment_plural) %></legend>
                     <% if @issue.attachments.any? && @issue.safe_attribute?('deleted_attachment_ids') %>
                     <div class="contextual"><%= link_to l(:label_edit_attachments), '#', :onclick => "$('#existing-attachments').toggle(); return false;" %></div>
                     <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
                       <% @issue.attachments.each do |attachment| %>
                       <span class="existing-attachment">
                         <%= text_field_tag '', attachment.filename, :class => "filename", :disabled => true %>
                         <label>
                           <%= check_box_tag 'issue[deleted_attachment_ids][]',
                                             attachment.id,
                                             @issue.deleted_attachment_ids.include?(attachment.id),
                                             :id => nil, :class => "deleted_attachment" %> <%= l(:button_delete) %>
                         </label>
                       </span>
                       <% end %>
                       <hr />
                     </div>
                     <% end %>
                     <div id="new-attachments" style="display:inline-block;">
                       <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
                     </div>
                   </fieldset>
                 <% end %>
                 </div>
                 <%= f.hidden_field :lock_version %>
                 <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
                 <%= submit_tag l(:button_submit) %>
                 <%= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' %>
                 | <%= link_to l(:button_cancel), {}, :onclick => "$('#update').hide(); return false;" %>
                 <%= hidden_field_tag 'prev_issue_id', @prev_issue_id if @prev_issue_id %>
                 <%= hidden_field_tag 'next_issue_id', @next_issue_id if @next_issue_id %>
                 <%= hidden_field_tag 'issue_position', @issue_position if @issue_position %>
                 <%= hidden_field_tag 'issue_count', @issue_count if @issue_count %>
             <% end %>
             <div id="preview" class="wiki"></div>

app/views/timelog/_form.html.erb +1 -1

             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box tabular">
               <% if @time_entry.new_record? %>
                 <% if params[:project_id] %>
                   <%= hidden_field_tag 'project_id', params[:project_id] %>
                 <% elsif params[:issue_id] %>
                   <%= hidden_field_tag 'issue_id', params[:issue_id] %>
                 <% else %>
                   <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).to_a, :selected => @time_entry.project, :include_blank => true), :required => true %></p>
                 <% end %>
               <% end %>
               <p>
                 <%= f.text_field :issue_id, :size => 6 %>
                 <span id="time_entry_issue">
                   <%=  link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>
                 </span>
               </p>
               <p><%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
-              <p><%= f.text_field :hours, :size => 6, :required => true, :value => format_hours(@time_entry.hours) %></p>
+              <p><%= f.hours_field :hours, :size => 6, :required => true %></p>
               <p><%= f.text_field :comments, :size => 100, :maxlength => 1024 %></p>
               <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
               <% @time_entry.custom_field_values.each do |value| %>
                 <p><%= custom_field_tag_with_label :time_entry, value %></p>
               <% end %>
               <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
             </div>
             <%= javascript_tag do %>
               $(document).ready(function(){
                 $('#time_entry_project_id, #time_entry_issue_id').change(function(){
                   $.ajax({
                     url: '<%= escape_javascript(@time_entry.new_record? ? new_time_entry_path(:format => 'js') : edit_time_entry_path(:format => 'js')) %>',
                     type: 'post',
                     data: $(this).closest('form').serialize()
                   });
                 });
               });
               observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
                 select: function(event, ui) {
                   $('#time_entry_issue').text('');
                   $('#time_entry_issue_id').val(ui.item.value).change();
                 }
               });
             <% end %>

lib/redmine/views/labelled_form_builder.rb +9 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             require 'action_view/helpers/form_helper'
             class Redmine::Views::LabelledFormBuilder < ActionView::Helpers::FormBuilder
               include Redmine::I18n
               (field_helpers.map(&:to_s) - %w(radio_button hidden_field fields_for check_box label) +
                     %w(date_select)).each do |selector|
                 src = <<-END_SRC
                 def #{selector}(field, options = {})
                   label_for_field(field, options) + super(field, options.except(:label)).html_safe
                 end
                 END_SRC
                 class_eval src, __FILE__, __LINE__
               end
               def check_box(field, options={}, checked_value="1", unchecked_value="0")
                 label_for_field(field, options) + super(field, options.except(:label), checked_value, unchecked_value).html_safe
               end
               def select(field, choices, options = {}, html_options = {})
                 label_for_field(field, options) + super(field, choices, options, html_options.except(:label)).html_safe
               end
               def time_zone_select(field, priority_zones = nil, options = {}, html_options = {})
                 label_for_field(field, options) + super(field, priority_zones, options, html_options.except(:label)).html_safe
               end
+              # A field for entering hours value
+              def hours_field(field, options={})
+                # display the value before type cast when the entered value is not valid
+                if @object.errors[field].blank?
+                  options = options.merge(:value => format_hours(@object.send field))
+                end
+                text_field field, options
+              end
               # Returns a label tag for the given field
               def label_for_field(field, options = {})
                 return ''.html_safe if options.delete(:no_label)
                 text = options[:label].is_a?(Symbol) ? l(options[:label]) : options[:label]
                 text ||= l(("field_" + field.to_s.gsub(/\_id$/, "")).to_sym)
                 text += @template.content_tag("span", " *", :class => "required") if options.delete(:required)
                 @template.content_tag("label", text.html_safe,
                                                :class => (@object && @object.errors[field].present? ? "error" : nil),
                                                :for => (@object_name.to_s + "_" + field.to_s))
               end
             end

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