From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 13:56:48 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/issues/_attributes.rhtml. X-Git-Tag: 1.3.0~947 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=add26327be2f44678928284b5d2ae1c0c5e76c4c;p=redmine.git rename .rhtml to .html.erb of app/views/issues/_attributes.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7016 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb new file mode 100644 index 000000000..ba42b919b --- /dev/null +++ b/app/views/issues/_attributes.html.erb @@ -0,0 +1,50 @@ +<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %> + +
+<% if @issue.new_record? || @allowed_statuses.any? %> +

<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %>

+<% else %> +

<%= h(@issue.status.name) %>

+<% end %> + +

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %>

+

<%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true %>

+<% unless @project.issue_categories.empty? %> +

<%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %> +<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), + l(:label_issue_category_new), + 'category[name]', + {:controller => 'issue_categories', :action => 'new', :project_id => @project}, + :title => l(:label_issue_category_new), + :tabindex => 199) if authorize_for('issue_categories', 'new') %>

+<% end %> +<% unless @issue.assignable_versions.empty? %> +

<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %> +<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), + l(:label_version_new), + 'version[name]', + {:controller => 'versions', :action => 'create', :project_id => @project}, + :title => l(:label_version_new), + :tabindex => 200) if authorize_for('versions', 'new') %> +

+<% end %> +
+ +
+<% if User.current.allowed_to?(:manage_subtasks, @project) %> +

<%= f.text_field :parent_issue_id, :size => 10 %>

+
+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> +<% end %> +

<%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %>

+

<%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %>

+

<%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %>

+<% if @issue.leaf? && Issue.use_field_for_done_ratio? %> +

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

+<% end %> +
+ +
+<%= render :partial => 'issues/form_custom_fields' %> + +<% end %> diff --git a/app/views/issues/_attributes.rhtml b/app/views/issues/_attributes.rhtml deleted file mode 100644 index ba42b919b..000000000 --- a/app/views/issues/_attributes.rhtml +++ /dev/null @@ -1,50 +0,0 @@ -<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %> - -
-<% if @issue.new_record? || @allowed_statuses.any? %> -

<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %>

-<% else %> -

<%= h(@issue.status.name) %>

-<% end %> - -

<%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %>

-

<%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true %>

-<% unless @project.issue_categories.empty? %> -

<%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %> -<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), - l(:label_issue_category_new), - 'category[name]', - {:controller => 'issue_categories', :action => 'new', :project_id => @project}, - :title => l(:label_issue_category_new), - :tabindex => 199) if authorize_for('issue_categories', 'new') %>

-<% end %> -<% unless @issue.assignable_versions.empty? %> -

<%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %> -<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), - l(:label_version_new), - 'version[name]', - {:controller => 'versions', :action => 'create', :project_id => @project}, - :title => l(:label_version_new), - :tabindex => 200) if authorize_for('versions', 'new') %> -

-<% end %> -
- -
-<% if User.current.allowed_to?(:manage_subtasks, @project) %> -

<%= f.text_field :parent_issue_id, :size => 10 %>

-
-<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> -<% end %> -

<%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %>

-

<%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %>

-

<%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %>

-<% if @issue.leaf? && Issue.use_field_for_done_ratio? %> -

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

-<% end %> -
- -
-<%= render :partial => 'issues/form_custom_fields' %> - -<% end %>