jro_apps/redmine Commit - r13869:e0fc84869660

Merged r14243 (#19793)....

Jean-Philippe Lang -

r13869:e0fc84869660

parent child

Context file:

r13869:e0fc84869660

Collapse all files

app/controllers/files_controller.rb +8 -1

             # Redmine - project management software
             # Copyright (C) 2006-2015  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 FilesController < ApplicationController
               menu_item :files
               before_filter :find_project_by_project_id
               before_filter :authorize
               helper :sort
               include SortHelper
               def index
                 sort_init 'filename', 'asc'
                 sort_update 'filename' => "#{Attachment.table_name}.filename",
                             'created_on' => "#{Attachment.table_name}.created_on",
                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
                 @containers = [Project.includes(:attachments).
                                  references(:attachments).reorder(sort_clause).find(@project.id)]
                 @containers += @project.versions.includes(:attachments).
                                 references(:attachments).reorder(sort_clause).to_a.sort.reverse
                 render :layout => !request.xhr?
               end
               def new
                 @versions = @project.versions.sort
               end
               def create
                 container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                 attachments = Attachment.attach_files(container, params[:attachments])
                 render_attachment_warning_if_needed(container)
-                if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+                if attachments[:files].present?
+                  if Setting.notified_events.include?('file_added')
                     Mailer.attachments_added(attachments[:files]).deliver
                   end
+                  flash[:notice] = l(:label_file_added)
                   redirect_to project_files_path(@project)
+                else
+                  flash.now[:error] = l(:label_attachment) + " " + l('activerecord.errors.messages.invalid')
+                  new
+                  render :action => 'new'
+                end
               end
             end

test/functional/files_controller_test.rb +11 0

             # Redmine - project management software
             # Copyright (C) 2006-2015  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.
             require File.expand_path('../../test_helper', __FILE__)
             class FilesControllerTest < ActionController::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users,
                        :email_addresses,
                        :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :journals, :journal_details,
                        :attachments,
                        :versions
               def setup
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:containers)
                 # file attached to the project
                 assert_select 'a[href=?]', '/attachments/download/8/project_file.zip', :text => 'project_file.zip'
                 # file attached to a project's version
                 assert_select 'a[href=?]', '/attachments/download/9/version_file.zip', :text => 'version_file.zip'
               end
               def test_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'version_id'
               end
               def test_new_without_versions
                 Version.delete_all
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'version_id', 0
               end
               def test_create_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 with_settings :notified_events => %w(file_added) do
                   assert_difference 'Attachment.count' do
                     post :create, :project_id => 1, :version_id => '',
                          :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                     assert_response :redirect
                   end
                 end
                 assert_redirected_to '/projects/ecookbook/files'
                 a = Attachment.order('created_on DESC').first
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Project.find(1), a.container
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal "[eCookbook] New file", mail.subject
                 assert_mail_body_match 'testfile.txt', mail
               end
               def test_create_version_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count' do
                   post :create, :project_id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   assert_response :redirect
                 end
                 assert_redirected_to '/projects/ecookbook/files'
                 a = Attachment.order('created_on DESC').first
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Version.find(2), a.container
               end
+              def test_create_without_file
+                set_tmp_attachments_directory
+                @request.session[:user_id] = 2
+                assert_no_difference 'Attachment.count' do
+                  post :create, :project_id => 1, :version_id => ''
+                  assert_response 200
+                  assert_template 'new'
+                end
+                assert_select 'div.error', 'File is invalid'
+              end
             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