Skip to content

O
OHR Support
Commit 0006c5f3 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

New document form can be accessed from the document list with no additional request. 

git-svn-id: http://redmine.rubyforge.org/svn/trunk@851 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 3c42abe0
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 8 deletions
app/controllers/projects_controller.rb
View file @ 0006c5f3
......@@ -174,7 +174,6 @@ class ProjectsController < ApplicationController
# Add a new document to @project
def add_document
@categories = Enumeration::get_values('DCAT')
@document = @project.documents.build(params[:document])
if request.post? and @document.save
# Save the attachments
......
app/views/common/_attachments_form.rhtml 0 → 100644
View file @ 0006c5f3
<p id="attachments_p">
<label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %>
<em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em>
</p>
app/views/documents/_form.rhtml
View file @ 0006c5f3
......@@ -2,9 +2,7 @@
<div class="box">
<!--[form:document]-->
<p><label for="document_category_id"><%=l(:field_category)%></label>
<select name="document[category_id]">
<%= options_from_collection_for_select @categories, "id", "name", @document.category_id %>
</select></p>
<%= select('document', 'category_id', Enumeration.get_values('DCAT').collect {|c| [c.name, c.id]}) %></p>
<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
<%= text_field 'document', 'title', :size => 60 %></p>
......
app/views/projects/add_document.rhtml
View file @ 0006c5f3
......@@ -4,9 +4,7 @@
<%= render :partial => 'documents/form' %>
<div class="box">
<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
<%= image_to_function "add.png", "addFileField();return false" %></label>
<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
<%= render :partial => 'common/attachments_form'%>
</div>
<%= submit_tag l(:button_create) %>
......
app/views/projects/list_documents.rhtml
View file @ 0006c5f3
<div class="contextual">
<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>
<%= link_to_if_authorized l(:label_document_new),
{:controller => 'projects', :action => 'add_document', :id => @project},
:class => 'icon icon-add',
:onclick => 'Element.show("add-document"); return false;' %>
</div>
<div id="add-document" style="display:none;">
<h2><%=l(:label_document_new)%></h2>
<% form_tag({:action => 'add_document', :id => @project}, :class => "tabular", :multipart => true) do %>
<%= render :partial => 'documents/form' %>
<div class="box">
<%= render :partial => 'common/attachments_form'%>
</div>
<%= submit_tag l(:button_create) %>
<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
<% end %>
</div>
<h2><%=l(:label_document_plural)%></h2>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment