jro_apps/redmine Commit - r22:dc26a9cd39be

association loading in documents/show...

Jean-Philippe Lang -

r22:dc26a9cd39be

parent child

Context file:

r22:dc26a9cd39be

Collapse all files

redmine/app/controllers/documents_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class DocumentsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def show
+                @attachments = @document.attachments.find(:all, :order => "created_on DESC")
               end
               def edit
                 @categories = Enumeration::get_values('DCAT')
                 if request.post? and @document.update_attributes(params[:document])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @document
                 end
               end
               def destroy
                 @document.destroy
                 redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
               end
               def download
                 @attachment = @document.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
               end
               def add_attachment
                 # Save the attachment
                 if params[:attachment][:file].size > 0
                   @attachment = @document.attachments.build(params[:attachment])
                   @attachment.author_id = self.logged_in_user.id if self.logged_in_user
                   @attachment.save
                 end
-                render :action => 'show'
+                redirect_to :action => 'show', :id => @document
               end
               def destroy_attachment
                 @document.attachments.find(params[:attachment_id]).destroy
-                render :action => 'show'
+                redirect_to :action => 'show', :id => @document
               end
             private
               def find_project
                 @document = Document.find(params[:id])
                 @project = @document.project
               end
             end

redmine/app/views/documents/show.rhtml +4 -4

             <h2><%= @document.title %></h2>
             <strong><%=l(:field_description)%>:</strong> <%= @document.description %><br />
             <strong><%=l(:field_category)%>:</strong> <%= @document.category.name %><br />
             <br />
             <% if authorize_for('documents', 'edit') %>
               <%= start_form_tag({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
               <%= submit_tag l(:button_edit) %>
               <%= end_form_tag %>
             <% end %>
             <% if authorize_for('documents', 'destroy') %>
               <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
               <%= submit_tag l(:button_delete) %>
               <%= end_form_tag %>
             <% end %>
             <br /><br />
-            <table border="0" cellspacing="1" cellpadding="2" width="100%">
+            <table class="listTableContent">
-            <% for attachment in @document.attachments %>
+            <% for attachment in @attachments %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
+              <td><%= format_date(attachment.created_on) %></td>
               <td><%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %></td>
-              <td align="center"><%= format_date(attachment.created_on) %></td>
               <td align="center"><%= attachment.author.display_name %></td>
               <td><%= human_size(attachment.filesize) %><br /><%= lwr(:label_download, attachment.downloads) %></td>
               <% if authorize_for('documents', 'destroy_attachment') %>
               <td align="center">
                 <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %>
                 <%= submit_tag l(:button_delete), :class => "button-small" %>
                 <%= end_form_tag %>
               </tr>
               <% end %>
             <% end %>
             </table>
             <br />
             <% if authorize_for('documents', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
               <%=l(:label_attachment_new)%><br /><%= file_field 'attachment', 'file'  %>
               <%= submit_tag l(:button_add) %>
               <%= end_form_tag %>
             <% end %>

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