jro_apps/redmine Commit - r538:f8ef65e8f641

0

app/controllers/attachments_controller.rb created 644 +39 0

			@@ -0,0 +1,39
		1	# redMine - project management software
		2	# Copyright (C) 2006-2007 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	class AttachmentsController < ApplicationController
		19	before_filter :find_project, :check_project_privacy
		20
		21	# sends an attachment
		22	def download
		23	send_file @attachment.diskfile, :filename => @attachment.filename
		24	end
		25
		26	# sends an image to be displayed inline
		27	def show
		28	render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg\|jpg\|gif\|png)$/i
		29	send_file @attachment.diskfile, :type => "image/#{$1}", :disposition => 'inline'
		30	end
		31
		32	private
		33	def find_project
		34	@attachment = Attachment.find(params[:id])
		35	@project = @attachment.project
		36	rescue
		37	render_404
		38	end
		39	end

0

app/helpers/attachments_helper.rb created 644 +25 0

			@@ -0,0 +1,25
		1	# redMine - project management software
		2	# Copyright (C) 2006-2007 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	module AttachmentsHelper
		19	# displays the links to a collection of attachments
		20	def link_to_attachments(attachments, options = {})
		21	if attachments.any?
		22	render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
		23	end
		24	end
		25	end

0

app/views/attachments/_form.rhtml created 644 +4 0

			@@ -0,0 +1,4
		1	<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
		2	<%= image_to_function "add.png", "addFileField();return false" %></label>
		3
		4	<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>

0

app/views/attachments/_links.rhtml created 644 +13 0

			@@ -0,0 +1,13
		1	<div class="attachments">
		2	<% for attachment in attachments %>
		3	<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' %>
		4	(<%= number_to_human_size attachment.filesize %>)
		5	<% unless options[:no_author] %>
		6	<em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em>
		7	<% end %>
		8	<% if options[:delete_url] %>
		9	<%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}), :confirm => l(:text_are_you_sure), :method => :post %>
		10	<% end %>
		11	</p>
		12	<% end %>
		13	</div>

0

db/migrate/050_add_wiki_attachments_permissions.rb created 644 +11 0

			@@ -0,0 +1,11
		1	class AddWikiAttachmentsPermissions < ActiveRecord::Migration
		2	def self.up
		3	Permission.create :controller => 'wiki', :action => 'add_attachment', :description => 'label_attachment_new', :sort => 1750, :is_public => false, :mail_option => 0, :mail_enabled => 0
		4	Permission.create :controller => 'wiki', :action => 'destroy_attachment', :description => 'label_attachment_delete', :sort => 1755, :is_public => false, :mail_option => 0, :mail_enabled => 0
		5	end
		6
		7	def self.down
		8	Permission.find_by_controller_and_action('wiki', 'add_attachment').destroy
		9	Permission.find_by_controller_and_action('wiki', 'destroy_attachment').destroy
		10	end
		11	end

0

app/controllers/issues_controller.rb +2 -8

                include IssueRelationsHelper
                helper :watchers
                include WatchersHelper
+               helper :attachments
+               include AttachmentsHelper
                def show
                  @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                  redirect_to :action => 'show', :id => @issue
                end
-               # Send the file in stream mode
-               def download
-                 @attachment = @issue.attachments.find(params[:attachment_id])
-                 send_file @attachment.diskfile, :filename => @attachment.filename
-               rescue
-                 render_404
-               end
              private
                def find_project
                  @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])

0

app/controllers/messages_controller.rb +3 -7

                verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
+               helper :attachments
+               include AttachmentsHelper
                def show
                  @reply = Message.new(:subject => "RE: #{@message.subject}")
                  render :action => "show", :layout => false if request.xhr?
                  redirect_to :action => 'show', :id => @message
                end
-               def download
-                 @attachment = @message.attachments.find(params[:attachment_id])
-                 send_file @attachment.diskfile, :filename => @attachment.filename
-               rescue
-                 render_404
-               end
              private
                def find_project
                  @board = Board.find(params[:board_id], :include => :project)

0

app/controllers/wiki_controller.rb +24 -3

              class WikiController < ApplicationController
                layout 'base'
-               before_filter :find_wiki, :check_project_privacy, :except => [:preview]
-               before_filter :authorize, :only => :destroy
+               before_filter :find_wiki, :check_project_privacy
+               before_filter :authorize, :only => [:destroy, :add_attachment, :destroy_attachment]
-               verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
+               verify :method => :post, :only => [:destroy, :destroy_attachment], :redirect_to => { :action => :index }
+               helper :attachments
+               include AttachmentsHelper
                # display a page (in editing mode if it doesn't exist)
                def index
                end
                def preview
+                 page = @wiki.find_page(params[:page])
+                 @attachements = page.attachments if page
                  @text = params[:content][:text]
                  render :partial => 'preview'
                end
+               def add_attachment
+                 @page = @wiki.find_page(params[:page])
+                 # Save the attachments
+                 params[:attachments].each { |file|
+                   next unless file.size > 0
+                   a = Attachment.create(:container => @page, :file => file, :author => logged_in_user)
+                 } if params[:attachments] and params[:attachments].is_a? Array
+                 redirect_to :action => 'index', :page => @page.title
+               end
+               def destroy_attachment
+                 @page = @wiki.find_page(params[:page])
+                 @page.attachments.find(params[:attachment_id]).destroy
+                 redirect_to :action => 'index', :page => @page.title
+               end
              private
                def find_wiki

0

app/helpers/application_helper.rb +18 -1

                  # example:
                  #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (@project.id is 6)
                  text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| link_to "r#{$1}", :controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1} if @project
+                 # when using an image link, try to use an attachment, if possible
+                 attachments = options[:attachments]
+                 if attachments
+                   text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+                     align = $1
+                     filename = $2
+                     rf = Regexp.new(filename,  Regexp::IGNORECASE)
+                     # search for the picture in attachments
+                     if found = attachments.detect { |att| att.filename =~ rf }
+                       image_url = url_for :controller => 'attachments', :action => 'show', :id => found.id
+                       "!#{align}#{image_url}!"
+                     else
+                       "!#{align}#{filename}!"
+                     end
+                   end
+                 end
                  # finally textilize text
                  @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
                  text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))

0

app/models/attachment.rb +5 -1

              	def self.most_downloaded
              		find(:all, :limit => 5, :order => "downloads DESC")
              	end
+               def project
+                 container.is_a?(Project) ? container : container.project
+               end
              private
                def sanitize_filename(value)
                    # get only the filename, not the whole path

0

app/models/message.rb +4 0

                    board.increment! :topics_count
                  end
                end
+               def project
+                 board.project
+               end
              end

0

app/models/wiki.rb +2 -1

                # find the page with the given title
                def find_page(title)
-                 pages.find_by_title(Wiki.titleize(title || start_page))
+                 title = start_page if title.blank?
+                 pages.find_by_title(Wiki.titleize(title))
                end
                # turn a string into a valid page title

0

app/models/wiki_page.rb +5 0

              class WikiPage < ActiveRecord::Base
                belongs_to :wiki
                has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
+               has_many :attachments, :as => :container, :dependent => :destroy
                validates_presence_of :title
                validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
                def self.pretty_title(str)
                  (str && str.is_a?(String)) ? str.tr('_', ' ') : str
                end
+               def project
+                 wiki.project
+               end
              end

0

app/views/issues/show.rhtml +8 -18

              <% end %>
              <b><%=l(:field_description)%> :</b><br /><br />
-             <%= textilizable @issue.description %>
+             <%= textilizable @issue.description, :attachments => @issue.attachments %>
              <br />
              <div class="contextual">
              <div class="box">
              <h3><%=l(:label_attachment_plural)%></h3>
-             <table width="100%">
-             <% for attachment in @issue.attachments %>
-             <tr>
-             <td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
-             <td><%= format_date(attachment.created_on) %></td>
-             <td><%= attachment.author.display_name %></td>
-             <td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
-             </tr>
-             <% end %>
-             </table>
-             <br />
+             <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
              <% if authorize_for('issues', 'add_attachment') %>
-               <% form_tag({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
-               <p id="attachments_p"><label><%=l(:label_attachment_new)%>
-               <%= 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>
-               <%= submit_tag l(:button_add) %>
-               <% end %>
+             <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
+             <% form_tag({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
+               <%= render :partial => 'attachments/form' %>
+             <%= submit_tag l(:button_add) %>
+             <% end %>
              <% end %>
              </div>

0

app/views/messages/_form.rhtml +1 -4

              <!--[eoform:message]-->
              <span class="tabular">
-             <p id="attachments_p"><label><%=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>
-             </span>
+             <%= render :partial => 'attachments/form' %>
              </div>

0

app/views/messages/show.rhtml +4 -9

              <p><em><%= @message.author.name %>, <%= format_time(@message.created_on) %></em></p>
              <div class="wiki">
-             <%= textilizable(@message.content) %>
+             <%= textilizable(@message.content, :attachments => @message.attachments) %>
              </div>
-             <div class="attachments">
-             <% @message.attachments.each do |attachment| %>
-             <%= link_to attachment.filename, { :action => 'download', :id => @message, :attachment_id => attachment }, :class => 'icon icon-attachment' %>
-             (<%= number_to_human_size(attachment.filesize) %>)<br />
-             <% end %>
-             </div>
-             <br />
+             <%= link_to_attachments @message.attachments, :no_author => true %>
              <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
              <% @message.children.each do |message| %>
                <a name="<%= "message-#{message.id}" %>"></a>
                <p><%= submit_tag l(:button_submit) %></p>
              <% end %>
              </div>
-             <% end %>
  No newline at end of file
+             <% end %>

0

app/views/wiki/_preview.rhtml +1 -1

              <fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-             <%= textilizable @text %>
+             <%= textilizable @text, :attachments => @attachements %>
              </fieldset>

0

app/views/wiki/show.rhtml +12 -2

              <div class="wiki">
              <% cache "wiki/show/#{@page.id}/#{@content.version}" do %>
-             <%= textilizable @content.text %>
+             <%= textilizable @content.text, :attachments => @page.attachments %>
              <% end %>
              </div>
+             <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
              <div class="contextual">
              <%= l(:label_export_to) %>
              <%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
              <%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
-             </div>
  No newline at end of file
+             </div>
+             <% if authorize_for('wiki', 'add_attachment') %>
+             <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
+             <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
+               <%= render :partial => 'attachments/form' %>
+             <%= submit_tag l(:button_add) %>
+             <% end %>
+             <% end %>

0

public/stylesheets/application.css +2 -1

              margin: 0 5px 5px;
              }
-             div.attachments {padding-left: 6px; border-left: 2px solid #ccc;}
+             div.attachments {padding-left: 6px; border-left: 2px solid #ccc; margin-bottom: 8px;}
+             div.attachments p {margin-bottom:2px;}
              .overlay{
              position: absolute;

	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