jro_apps/redmine Commit - r13034:198e92d26b49

Merged r13390 (#17163)....

Jean-Philippe Lang -

r13034:198e92d26b49

parent child

Context file:

r13034:198e92d26b49

Collapse all files

app/models/version.rb +4 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 Version < ActiveRecord::Base
               include Redmine::SafeAttributes
               after_update :update_issues_from_sharing_change
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id', :dependent => :nullify
               acts_as_customizable
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               VERSION_STATUSES = %w(open locked closed)
               VERSION_SHARINGS = %w(none descendants hierarchy tree system)
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
               validates_length_of :name, :maximum => 60
               validates :effective_date, :date => true
               validates_inclusion_of :status, :in => VERSION_STATUSES
               validates_inclusion_of :sharing, :in => VERSION_SHARINGS
               scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
               scope :open, lambda { where(:status => 'open') }
               scope :visible, lambda {|*args|
                 includes(:project).where(Project.allowed_to_condition(args.first || User.current, :view_issues))
               }
               safe_attributes 'name',
                 'description',
                 'effective_date',
                 'due_date',
                 'wiki_page_title',
                 'status',
                 'sharing',
                 'custom_field_values',
                 'custom_fields'
               # Returns true if +user+ or current user is allowed to view the version
               def visible?(user=User.current)
                 user.allowed_to?(:view_issues, self.project)
               end
               # Version files have same visibility as project files
               def attachments_visible?(*args)
                 project.present? && project.attachments_visible?(*args)
               end
+              def attachments_deletable?(usr=User.current)
+                project.present? && project.attachments_deletable?(usr)
+              end
               def start_date
                 @start_date ||= fixed_issues.minimum('start_date')
               end
               def due_date
                 effective_date
               end
               def due_date=(arg)
                 self.effective_date=(arg)
               end
               # Returns the total estimated time for this version
               # (sum of leaves estimated_hours)
               def estimated_hours
                 @estimated_hours ||= fixed_issues.leaves.sum(:estimated_hours).to_f
               end
               # Returns the total reported time for this version
               def spent_hours
                 @spent_hours ||= TimeEntry.joins(:issue).where("#{Issue.table_name}.fixed_version_id = ?", id).sum(:hours).to_f
               end
               def closed?
                 status == 'closed'
               end
               def open?
                 status == 'open'
               end
               # Returns true if the version is completed: due date reached and no open issues
               def completed?
                 effective_date && (effective_date < Date.today) && (open_issues_count == 0)
               end
               def behind_schedule?
                 if completed_percent == 100
                   return false
                 elsif due_date && start_date
                   done_date = start_date + ((due_date - start_date+1)* completed_percent/100).floor
                   return done_date <= Date.today
                 else
                   false # No issues so it's not late
                 end
               end
               # Returns the completion percentage of this version based on the amount of open/closed issues
               # and the time spent on the open issues.
               def completed_percent
                 if issues_count == 0
                 elsif open_issues_count == 0
                 else
                   issues_progress(false) + issues_progress(true)
                 end
               end
               # TODO: remove in Redmine 3.0
               def completed_pourcent
                 ActiveSupport::Deprecation.warn "Version#completed_pourcent is deprecated and will be removed in Redmine 3.0. Please use #completed_percent instead."
                 completed_percent
               end
               # Returns the percentage of issues that have been marked as 'closed'.
               def closed_percent
                 if issues_count == 0
                 else
                   issues_progress(false)
                 end
               end
               # TODO: remove in Redmine 3.0
               def closed_pourcent
                 ActiveSupport::Deprecation.warn "Version#closed_pourcent is deprecated and will be removed in Redmine 3.0. Please use #closed_percent instead."
                 closed_percent
               end
               # Returns true if the version is overdue: due date reached and some open issues
               def overdue?
                 effective_date && (effective_date < Date.today) && (open_issues_count > 0)
               end
               # Returns assigned issues count
               def issues_count
                 load_issue_counts
                 @issue_count
               end
               # Returns the total amount of open issues for this version.
               def open_issues_count
                 load_issue_counts
                 @open_issues_count
               end
               # Returns the total amount of closed issues for this version.
               def closed_issues_count
                 load_issue_counts
                 @closed_issues_count
               end
               def wiki_page
                 if project.wiki && !wiki_page_title.blank?
                   @wiki_page ||= project.wiki.find_page(wiki_page_title)
                 end
                 @wiki_page
               end
               def to_s; name end
               def to_s_with_project
                 "#{project} - #{name}"
               end
               # Versions are sorted by effective_date and name
               # Those with no effective_date are at the end, sorted by name
               def <=>(version)
                 if self.effective_date
                   if version.effective_date
                     if self.effective_date == version.effective_date
                       name == version.name ? id <=> version.id : name <=> version.name
                     else
                       self.effective_date <=> version.effective_date
                     end
                   else
                     -1
                   end
                 else
                   if version.effective_date
                   else
                     name == version.name ? id <=> version.id : name <=> version.name
                   end
                 end
               end
               def self.fields_for_order_statement(table=nil)
                 table ||= table_name
                 ["(CASE WHEN #{table}.effective_date IS NULL THEN 1 ELSE 0 END)", "#{table}.effective_date", "#{table}.name", "#{table}.id"]
               end
               scope :sorted, lambda { order(fields_for_order_statement) }
               # Returns the sharings that +user+ can set the version to
               def allowed_sharings(user = User.current)
                 VERSION_SHARINGS.select do |s|
                   if sharing == s
                     true
                   else
                     case s
                     when 'system'
                       # Only admin users can set a systemwide sharing
                       user.admin?
                     when 'hierarchy', 'tree'
                       # Only users allowed to manage versions of the root project can
                       # set sharing to hierarchy or tree
                       project.nil? || user.allowed_to?(:manage_versions, project.root)
                     else
                       true
                     end
                   end
                 end
               end
               private
               def load_issue_counts
                 unless @issue_count
                   @open_issues_count = 0
                   @closed_issues_count = 0
                   fixed_issues.group(:status).count.each do |status, count|
                     if status.is_closed?
                       @closed_issues_count += count
                     else
                       @open_issues_count += count
                     end
                   end
                   @issue_count = @open_issues_count + @closed_issues_count
                 end
               end
               # Update the issue's fixed versions. Used if a version's sharing changes.
               def update_issues_from_sharing_change
                 if sharing_changed?
                   if VERSION_SHARINGS.index(sharing_was).nil? ||
                       VERSION_SHARINGS.index(sharing).nil? ||
                       VERSION_SHARINGS.index(sharing_was) > VERSION_SHARINGS.index(sharing)
                     Issue.update_versions_from_sharing_change self
                   end
                 end
               end
               # Returns the average estimated time of assigned issues
               # or 1 if no issue has an estimated time
               # Used to weigth unestimated issues in progress calculation
               def estimated_average
                 if @estimated_average.nil?
                   average = fixed_issues.average(:estimated_hours).to_f
                   if average == 0
                     average = 1
                   end
                   @estimated_average = average
                 end
                 @estimated_average
               end
               # Returns the total progress of open or closed issues.  The returned percentage takes into account
               # the amount of estimated time set for this version.
               #
               # Examples:
               # issues_progress(true)   => returns the progress percentage for open issues.
               # issues_progress(false)  => returns the progress percentage for closed issues.
               def issues_progress(open)
                 @issues_progress ||= {}
                 @issues_progress[open] ||= begin
                   progress = 0
                   if issues_count > 0
                     ratio = open ? 'done_ratio' : 100
                     done = fixed_issues.open(open).sum("COALESCE(estimated_hours, #{estimated_average}) * #{ratio}").to_f
                     progress = done / (estimated_average * issues_count)
                   end
                   progress
                 end
               end
             end

test/functional/attachments_controller_test.rb +10 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  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 AttachmentsControllerTest < ActionController::TestCase
               fixtures :users, :projects, :roles, :members, :member_roles,
                        :enabled_modules, :issues, :trackers, :attachments,
                        :versions, :wiki_pages, :wikis, :documents
               def setup
                 User.current = nil
                 set_fixtures_attachments_directory
               end
               def teardown
                 set_tmp_attachments_directory
               end
               def test_show_diff
                 ['inline', 'sbs'].each do |dt|
                   # 060719210727_changeset_utf8.diff
                   get :show, :id => 14, :type => dt
                   assert_response :success
                   assert_template 'diff'
                   assert_equal 'text/html', @response.content_type
                   assert_tag 'th',
                     :attributes => {:class => /filename/},
                     :content => /issues_controller.rb\t\(révision 1484\)/
                   assert_tag 'td',
                     :attributes => {:class => /line-code/},
                     :content => /Demande créée avec succès/
                 end
                 set_tmp_attachments_directory
               end
               def test_show_diff_replace_cannot_convert_content
                 with_settings :repositories_encodings => 'UTF-8' do
                   ['inline', 'sbs'].each do |dt|
                     # 060719210727_changeset_iso8859-1.diff
                     get :show, :id => 5, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_equal 'text/html', @response.content_type
                     assert_tag 'th',
                       :attributes => {:class => "filename"},
                       :content => /issues_controller.rb\t\(r\?vision 1484\)/
                     assert_tag 'td',
                       :attributes => {:class => /line-code/},
                       :content => /Demande cr\?\?e avec succ\?s/
                   end
                 end
                 set_tmp_attachments_directory
               end
               def test_show_diff_latin_1
                 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                   ['inline', 'sbs'].each do |dt|
                     # 060719210727_changeset_iso8859-1.diff
                     get :show, :id => 5, :type => dt
                     assert_response :success
                     assert_template 'diff'
                     assert_equal 'text/html', @response.content_type
                     assert_tag 'th',
                       :attributes => {:class => "filename"},
                       :content => /issues_controller.rb\t\(révision 1484\)/
                     assert_tag 'td',
                       :attributes => {:class => /line-code/},
                       :content => /Demande créée avec succès/
                   end
                 end
                 set_tmp_attachments_directory
               end
               def test_save_diff_type
                 user1 = User.find(1)
                 user1.pref[:diff_type] = nil
                 user1.preference.save
                 user = User.find(1)
                 assert_nil user.pref[:diff_type]
                 @request.session[:user_id] = 1 # admin
                 get :show, :id => 5
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "inline", user.pref[:diff_type]
                 get :show, :id => 5, :type => 'sbs'
                 assert_response :success
                 assert_template 'diff'
                 user.reload
                 assert_equal "sbs", user.pref[:diff_type]
               end
               def test_diff_show_filename_in_mercurial_export
                 set_tmp_attachments_directory
                 a = Attachment.new(:container => Issue.find(1),
                                    :file => uploaded_test_file("hg-export.diff", "text/plain"),
                                    :author => User.find(1))
                 assert a.save
                 assert_equal 'hg-export.diff', a.filename
                 get :show, :id => a.id, :type => 'inline'
                 assert_response :success
                 assert_template 'diff'
                 assert_equal 'text/html', @response.content_type
                 assert_select 'th.filename', :text => 'test1.txt'
               end
               def test_show_text_file
                 get :show, :id => 4
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_text_file_utf_8
                 set_tmp_attachments_directory
                 a = Attachment.new(:container => Issue.find(1),
                                    :file => uploaded_test_file("japanese-utf-8.txt", "text/plain"),
                                    :author => User.find(1))
                 assert a.save
                 assert_equal 'japanese-utf-8.txt', a.filename
                 str_japanese = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
                 str_japanese.force_encoding('UTF-8') if str_japanese.respond_to?(:force_encoding)
                 get :show, :id => a.id
                 assert_response :success
                 assert_template 'file'
                 assert_equal 'text/html', @response.content_type
                 assert_tag :tag => 'th',
                            :content => '1',
                            :attributes => { :class => 'line-num' },
                            :sibling => { :tag => 'td', :content => /#{str_japanese}/ }
               end
               def test_show_text_file_replace_cannot_convert_content
                 set_tmp_attachments_directory
                 with_settings :repositories_encodings => 'UTF-8' do
                   a = Attachment.new(:container => Issue.find(1),
                                      :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
                                      :author => User.find(1))
                   assert a.save
                   assert_equal 'iso8859-1.txt', a.filename
                   get :show, :id => a.id
                   assert_response :success
                   assert_template 'file'
                   assert_equal 'text/html', @response.content_type
                   assert_tag :tag => 'th',
                              :content => '7',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Demande cr\?\?e avec succ\?s/ }
                 end
               end
               def test_show_text_file_latin_1
                 set_tmp_attachments_directory
                 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
                   a = Attachment.new(:container => Issue.find(1),
                                      :file => uploaded_test_file("iso8859-1.txt", "text/plain"),
                                      :author => User.find(1))
                   assert a.save
                   assert_equal 'iso8859-1.txt', a.filename
                   get :show, :id => a.id
                   assert_response :success
                   assert_template 'file'
                   assert_equal 'text/html', @response.content_type
                   assert_tag :tag => 'th',
                              :content => '7',
                              :attributes => { :class => 'line-num' },
                              :sibling => { :tag => 'td', :content => /Demande créée avec succès/ }
                   end
               end
               def test_show_text_file_should_send_if_too_big
                 Setting.file_max_size_displayed = 512
                 Attachment.find(4).update_attribute :filesize, 754.kilobyte
                 get :show, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_other
                 get :show, :id => 6
                 assert_response :success
                 assert_equal 'application/octet-stream', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_show_file_from_private_issue_without_permission
                 get :show, :id => 15
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2F15'
                 set_tmp_attachments_directory
               end
               def test_show_file_from_private_issue_with_permission
                 @request.session[:user_id] = 2
                 get :show, :id => 15
                 assert_response :success
                 assert_tag 'h2', :content => /private.diff/
                 set_tmp_attachments_directory
               end
               def test_show_file_without_container_should_be_allowed_to_author
                 set_tmp_attachments_directory
                 attachment = Attachment.create!(:file => uploaded_test_file("testfile.txt", "text/plain"), :author_id => 2)
                 @request.session[:user_id] = 2
                 get :show, :id => attachment.id
                 assert_response 200
               end
               def test_show_file_without_container_should_be_denied_to_other_users
                 set_tmp_attachments_directory
                 attachment = Attachment.create!(:file => uploaded_test_file("testfile.txt", "text/plain"), :author_id => 2)
                 @request.session[:user_id] = 3
                 get :show, :id => attachment.id
                 assert_response 403
               end
               def test_show_invalid_should_respond_with_404
                 get :show, :id => 999
                 assert_response 404
               end
               def test_download_text_file
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'application/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_download_version_file_with_issue_tracking_disabled
                 Project.find(1).disable_module! :issue_tracking
                 get :download, :id => 9
                 assert_response :success
               end
               def test_download_should_assign_content_type_if_blank
                 Attachment.find(4).update_attribute(:content_type, '')
                 get :download, :id => 4
                 assert_response :success
                 assert_equal 'text/x-ruby', @response.content_type
                 set_tmp_attachments_directory
               end
               def test_download_missing_file
                 get :download, :id => 2
                 assert_response 404
                 set_tmp_attachments_directory
               end
               def test_download_should_be_denied_without_permission
                 get :download, :id => 7
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fdownload%2F7'
                 set_tmp_attachments_directory
               end
               if convert_installed?
                 def test_thumbnail
                   Attachment.clear_thumbnails
                   @request.session[:user_id] = 2
                   get :thumbnail, :id => 16
                   assert_response :success
                   assert_equal 'image/png', response.content_type
                 end
                 def test_thumbnail_should_not_exceed_maximum_size
                   Redmine::Thumbnail.expects(:generate).with {|source, target, size| size == 800}
                   @request.session[:user_id] = 2
                   get :thumbnail, :id => 16, :size => 2000
                 end
                 def test_thumbnail_should_round_size
                   Redmine::Thumbnail.expects(:generate).with {|source, target, size| size == 250}
                   @request.session[:user_id] = 2
                   get :thumbnail, :id => 16, :size => 260
                 end
                 def test_thumbnail_should_return_404_for_non_image_attachment
                   @request.session[:user_id] = 2
                   get :thumbnail, :id => 15
                   assert_response 404
                 end
                 def test_thumbnail_should_return_404_if_thumbnail_generation_failed
                   Attachment.any_instance.stubs(:thumbnail).returns(nil)
                   @request.session[:user_id] = 2
                   get :thumbnail, :id => 16
                   assert_response 404
                 end
                 def test_thumbnail_should_be_denied_without_permission
                   get :thumbnail, :id => 16
                   assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Fattachments%2Fthumbnail%2F16'
                 end
               else
                 puts '(ImageMagick convert not available)'
               end
               def test_destroy_issue_attachment
                 set_tmp_attachments_directory
                 issue = Issue.find(3)
                 @request.session[:user_id] = 2
                 assert_difference 'issue.attachments.count', -1 do
                   assert_difference 'Journal.count' do
                     delete :destroy, :id => 1
                     assert_redirected_to '/projects/ecookbook'
                   end
                 end
                 assert_nil Attachment.find_by_id(1)
                 j = Journal.order('id DESC').first
                 assert_equal issue, j.journalized
                 assert_equal 'attachment', j.details.first.property
                 assert_equal '1', j.details.first.prop_key
                 assert_equal 'error281.txt', j.details.first.old_value
                 assert_equal User.find(2), j.user
               end
               def test_destroy_wiki_page_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 3
                   assert_response 302
                 end
               end
               def test_destroy_project_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 8
                   assert_response 302
                 end
               end
               def test_destroy_version_attachment
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 assert_difference 'Attachment.count', -1 do
                   delete :destroy, :id => 9
                   assert_response 302
                 end
               end
+              def test_destroy_version_attachment_with_issue_tracking_disabled
+                Project.find(1).disable_module! :issue_tracking
+                set_tmp_attachments_directory
+                @request.session[:user_id] = 2
+                assert_difference 'Attachment.count', -1 do
+                  delete :destroy, :id => 9
+                  assert_response 302
+                end
+              end
               def test_destroy_without_permission
                 set_tmp_attachments_directory
                 assert_no_difference 'Attachment.count' do
                   delete :destroy, :id => 3
                 end
                 assert_response 302
                 assert Attachment.find_by_id(3)
               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