diff options
Diffstat (limited to 'app/views/issues')
-rw-r--r-- | app/views/issues/_attributes.html.erb | 19 | ||||
-rw-r--r-- | app/views/issues/_form.html.erb | 4 | ||||
-rw-r--r-- | app/views/issues/_form_custom_fields.html.erb | 4 |
3 files changed, 15 insertions, 12 deletions
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index d2c13e82b..cc51cd435 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -4,6 +4,9 @@ <div class="splitcontentleft"> <% if @issue.safe_attribute? 'status_id' %> <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p> +<%= observe_field :issue_status_id, :url => project_issue_form_path(@project, :id => @issue), + :with => "Form.serialize('issue-form')" %> + <% else %> <p><label><%= l(:field_status) %></label> <%= h(@issue.status.name) %></p> <% end %> @@ -13,11 +16,11 @@ <% 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 %></p> +<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 %> +<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_remote(image_tag('add.png', :style => 'vertical-align: middle;'), {:url => new_project_issue_category_path(@issue.project), :method => 'get'}, :title => l(:label_issue_category_new), @@ -25,7 +28,7 @@ <% 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 %> +<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_remote(image_tag('add.png', :style => 'vertical-align: middle;'), {:url => new_project_version_path(@issue.project), :method => 'get'}, :title => l(:label_version_new), @@ -36,25 +39,25 @@ <div class="splitcontentright"> <% if @issue.safe_attribute? 'parent_issue_id' %> -<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p> +<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10, :required => @issue.required_attribute?('parent_issue_id') %></p> <div id="parent_issue_candidates" class="autocomplete"></div> <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @issue.project) }')" %> <% end %> <% if @issue.safe_attribute? 'start_date' %> -<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p> +<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('start_date') %><%= calendar_for('issue_start_date') if @issue.leaf? %></p> <% end %> <% if @issue.safe_attribute? 'due_date' %> -<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p> +<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('due_date') %><%= calendar_for('issue_due_date') if @issue.leaf? %></p> <% end %> <% if @issue.safe_attribute? 'estimated_hours' %> -<p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p> +<p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p> <% end %> <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %> -<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p> +<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> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 9bc362377..4a13fa07a 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -9,7 +9,7 @@ <% if @issue.safe_attribute? 'project_id' %> <p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), :required => true %></p> -<%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue, :project_change => '1'), +<%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue), :with => "Form.serialize('issue-form')" %> <% end %> @@ -25,7 +25,7 @@ <% if @issue.safe_attribute? 'description' %> <p> - <label><%= l(:field_description) %></label> + <%= f.label_for_field :description, :required => @issue.required_attribute?('description') %> <%= link_to_function image_tag('edit.png'), 'Element.hide(this); Effect.toggle("issue_description_and_toolbar", "appear", {duration:0.3})' unless @issue.new_record? %> <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %> diff --git a/app/views/issues/_form_custom_fields.html.erb b/app/views/issues/_form_custom_fields.html.erb index 33b0b848b..4da98eb13 100644 --- a/app/views/issues/_form_custom_fields.html.erb +++ b/app/views/issues/_form_custom_fields.html.erb @@ -2,8 +2,8 @@ <div class="splitcontentleft"> <% i = 0 %> <% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %> -<% @issue.custom_field_values.each do |value| %> - <p><%= custom_field_tag_with_label :issue, value %></p> +<% @issue.editable_custom_field_values.each do |value| %> + <p><%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %></p> <% if i == split_on -%> </div><div class="splitcontentright"> <% end -%> |