diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-03-20 08:08:12 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-03-20 08:08:12 +0000 |
| commit | a70cbe6eb2db8958369397a75b53736f2d2b6a73 (patch) | |
| tree | 439b6d88077edda8a3f58410f522d3cc63d308d0 | |
| parent | a266b9358b988e150a6d1001c19ee14d73123ed3 (diff) | |
| download | redmine-a70cbe6eb2db8958369397a75b53736f2d2b6a73.tar.gz redmine-a70cbe6eb2db8958369397a75b53736f2d2b6a73.zip | |
Merged r21465 and r21466 to 4.1-stable (#36686).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21475 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/documents/_form.html.erb | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb index b8b8c8404..71ef2022b 100644 --- a/app/views/documents/_form.html.erb +++ b/app/views/documents/_form.html.erb @@ -1,24 +1,22 @@ <%= error_messages_for @document %> <div class="box tabular"> -<p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p> -<p><%= f.text_field :title, :required => true, :size => 60 %></p> -<p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit', - :data => { - :auto_complete => true, - :issues_url => auto_complete_issues_path(:project_id => @project, :q => '') - } -%></p> + <p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p> + <p><%= f.text_field :title, :required => true, :size => 60 %></p> + <p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit', + :data => { + :auto_complete => true, + :issues_url => auto_complete_issues_path(:project_id => @project, :q => '') + } + %></p> -<% @document.custom_field_values.each do |value| %> - <p><%= custom_field_tag_with_label :document, value %></p> -<% end %> + <% @document.custom_field_values.each do |value| %> + <p><%= custom_field_tag_with_label :document, value %></p> + <% end %> + + <% if @document.new_record? %> + <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p> + <% end %> </div> <%= wikitoolbar_for 'document_description' %> - -<% if @document.new_record? %> -<div class="box tabular"> -<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p> -</div> -<% end %> |