jro_apps/redmine Commit - r7890:c3c2a4afe008

Resourcified documents....

Jean-Philippe Lang -

r7890:c3c2a4afe008

parent child

Context file:

r7890:c3c2a4afe008

Collapse all files

app/controllers/documents_controller.rb +16 -6

             class DocumentsController < ApplicationController
               default_search_scope :documents
               model_object Document
-              before_filter :find_project_by_project_id, :only => [:index, :new]
+              before_filter :find_project_by_project_id, :only => [:index, :new, :create]
-              before_filter :find_model_object, :except => [:index, :new]
+              before_filter :find_model_object, :except => [:index, :new, :create]
-              before_filter :find_project_from_association, :except => [:index, :new]
+              before_filter :find_project_from_association, :except => [:index, :new, :create]
               before_filter :authorize
               helper :attachments
               def new
                 @document = @project.documents.build(params[:document])
+              end
+              def create
+                @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   attachments = Attachment.attach_files(@document, params[:attachments])
                   render_attachment_warning_if_needed(@document)
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index', :project_id => @project
+                else
+                  render :action => 'new'
                 end
               end
               def edit
-                @categories = DocumentCategory.active #TODO: use it in the views
+              end
-                if request.post? and @document.update_attributes(params[:document])
+              def update
+                if request.put? and @document.update_attributes(params[:document])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
+                else
+                  render :action => 'edit'
                 end
               end
               def destroy
-                @document.destroy
+                @document.destroy if request.delete?
                 redirect_to :controller => 'documents', :action => 'index', :project_id => @project
               end

app/views/documents/_document.html.erb +1 -1

-            <h4><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %></h4>
+            <h4><%= link_to h(document.title), document_path(document) %></h4>
             <p><em><%= format_time(document.updated_on) %></em></p>
             <div class="wiki">

app/views/documents/_form.html.erb +11 -11

@@ -1,15 +1,15
1	<%= error_messages~~_for 'document'~~ %>	1	<%= f.error_messages %>
2	<div class="box">
3	<!--[form:document]-->
4	<p><label for="document_category_id"><%=l(:field_category)%></label>
5	<%= select('document', 'category_id', DocumentCategory.active.collect {\|c\| [c.name, c.id]}) %></p>
6		2
7	<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>	3	<div class="box tabular">
8	<%= text_field 'document', 'title', :size => 60 %></p>	4	<p><%= f.select :category_id, DocumentCategory.active.collect {\|c\| [c.name, c.id]} %></p>
9		5	<p><%= f.text_field :title, :required => true, :size => 60 %></p>
10	<p><label for="document_description"><%=l(:field_description)%></label>	6	<p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
11	<%= text_area 'document', 'description', :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
12	<!--[eoform:document]-->
13	</div>	7	</div>
14		8
15	<%= wikitoolbar_for 'document_description' %>	9	<%= wikitoolbar_for 'document_description' %>
		10
		11	<% if @document.new_record? %>
		12	<div class="box tabular">
		13	<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
		14	</div>
		15	<% end %>

app/views/documents/edit.html.erb +3 -3

             <h2><%=l(:label_document)%></h2>
-            <% form_tag({:action => 'edit', :id => @document}, :class => "tabular") do %>
+            <% labelled_form_for @document do |f| %>
-              <%= render :partial => 'form' %>
+              <%= render :partial => 'form', :locals => {:f => f} %>
-              <%= submit_tag l(:button_save) %>
+              <p><%= submit_tag l(:button_save) %></p>
             <% end %>

app/views/documents/index.html.erb +6 -9

             <div class="contextual">
-            <%= link_to_if_authorized l(:label_document_new),
+            <%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
-                                      {:controller => 'documents', :action => 'new', :project_id => @project},
+                  :onclick => 'Element.show("add-document"); Form.Element.focus("document_title"); return false;' if User.current.allowed_to?(:manage_documents, @project) %>
-                                      :class => 'icon icon-add',
-                                      :onclick => 'Element.show("add-document"); Form.Element.focus("document_title"); return false;' %>
             </div>
             <div id="add-document" style="display:none;">
             <h2><%=l(:label_document_new)%></h2>
-            <% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
+            <% labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do |f| %>
-            <%= render :partial => 'documents/form' %>
+            <%= render :partial => 'form', :locals => {:f => f} %>
-            <div class="box">
+            <p>
-            <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
-            </div>
             	<%= submit_tag l(:button_create) %>
               <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
+            </p>
             <% end %>
             </div>

app/views/documents/new.html.erb +3 -10

@@ -1,13 +1,6
1	<h2><%=l(:label_document_new)%></h2>	1	<h2><%=l(:label_document_new)%></h2>
2		2
3	<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>	3	<% labelled_form_for @document, :url => project_documents_path(@project), :html => {:multipart => true} do \|f\| %>
4	<%= render :partial => '~~documents/~~form' %>	4	<%= render :partial => 'form', :locals => {:f => f} %>
5		5	<p><%= submit_tag l(:button_create) %></p>
6	<div class="box">
7	<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
8	</div>
9
10	<%= submit_tag l(:button_create) %>
11	<% end %>	6	<% end %>
12
13

app/views/documents/show.html.erb +4 -2

             <div class="contextual">
-            <%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
+            <% if User.current.allowed_to?(:manage_documents, @project) %>
-            <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+            <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
+            <%= link_to l(:button_delete), document_path(@document), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+            <% end %>
             </div>
             <h2><%=h @document.title %></h2>

config/routes.rb +1 -14

                 end
               end
-              map.with_options :controller => 'documents' do |document_routes|
-                document_routes.with_options :conditions => {:method => :get} do |document_views|
-                  document_views.connect 'projects/:project_id/documents', :action => 'index'
-                  document_views.connect 'projects/:project_id/documents/new', :action => 'new'
-                  document_views.connect 'documents/:id', :action => 'show'
-                  document_views.connect 'documents/:id/edit', :action => 'edit'
-                end
-                document_routes.with_options :conditions => {:method => :post} do |document_actions|
-                  document_actions.connect 'projects/:project_id/documents', :action => 'new'
-                  document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
-                end
-              end
               map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
               map.resources :queries, :except => [:show]
                 project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
                 project.resources :queries, :only => [:new, :create]
                 project.resources :issue_categories, :shallow => true
+                project.resources :documents, :shallow => true, :member => {:add_attachment => :post}
                 project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
                 project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}
               #left old routes at the bottom for backwards compat
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
-              map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'

lib/redmine.rb +1 -1

               end
               map.project_module :documents do |map|
-                map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
+                map.permission :manage_documents, {:documents => [:new, :create, :edit, :update, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end

test/functional/documents_controller_test.rb +11 -4

                 assert_template 'show'
               end
-              def test_new_with_one_attachment
+              def test_new
+                @request.session[:user_id] = 2
+                get :new, :project_id => 1
+                assert_response :success
+                assert_template 'new'
+              end
+              def test_create_with_one_attachment
                 ActionMailer::Base.deliveries.clear
                 Setting.notified_events << 'document_added'
                 @request.session[:user_id] = 2
                 set_tmp_attachments_directory
-                post :new, :project_id => 'ecookbook',
+                post :create, :project_id => 'ecookbook',
                            :document => { :title => 'DocumentsControllerTest#test_post_new',
                                           :description => 'This is a new document',
                                           :category_id => 2},
               def test_update
                 @request.session[:user_id] = 2
-                post :edit, :id => 1, :document => {:title => 'test_update'}
+                put :update, :id => 1, :document => {:title => 'test_update'}
                 assert_redirected_to '/documents/1'
                 document = Document.find(1)
                 assert_equal 'test_update', document.title
               def test_destroy
                 @request.session[:user_id] = 2
                 assert_difference 'Document.count', -1 do
-                  post :destroy, :id => 1
+                  delete :destroy, :id => 1
                 end
                 assert_redirected_to '/projects/ecookbook/documents'
                 assert_nil Document.find_by_id(1)

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