jro_apps/redmine Commit - r1206:66594d46b20d

Allow longer version names (#711, closes #712)....

Jean-Philippe Lang -

r1206:66594d46b20d

parent child

Context file:

r1206:66594d46b20d

Collapse all files

db/migrate/090_change_versions_name_limit.rb created 644 +9 0

			@@ -0,0 +1,9
		1	class ChangeVersionsNameLimit < ActiveRecord::Migration
		2	def self.up
		3	change_column :versions, :name, :string, :limit => nil
		4	end
		5
		6	def self.down
		7	change_column :versions, :name, :string, :limit => 30
		8	end
		9	end

app/models/version.rb +1 -1

              # 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 Version < ActiveRecord::Base
                before_destroy :check_integrity
                belongs_to :project
                has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
                has_many :attachments, :as => :container, :dependent => :destroy
                validates_presence_of :name
                validates_uniqueness_of :name, :scope => [:project_id]
-               validates_length_of :name, :maximum => 30
+               validates_length_of :name, :maximum => 60
                validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
                def start_date
                  effective_date
                end
                def due_date
                  effective_date
                end
                # Returns the total estimated time for this version
                def estimated_hours
                  @estimated_hours ||= fixed_issues.sum(:estimated_hours).to_f
                end
                # Returns the total reported time for this version
                def spent_hours
                  @spent_hours ||= TimeEntry.sum(:hours, :include => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f
                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 completed_pourcent
                  if fixed_issues.count == 0
 
                  elsif open_issues_count == 0
 
                  else
                    (closed_issues_count * 100 + Issue.sum('done_ratio', :include => 'status', :conditions => ["fixed_version_id = ? AND is_closed = ?", id, false]).to_f) / fixed_issues.count
                  end
                end
                def closed_pourcent
                  if fixed_issues.count == 0
 
                  else
                    closed_issues_count * 100.0 / fixed_issues.count
                  end
                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
                def open_issues_count
                  @open_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, false], :include => :status)
                end
                def closed_issues_count
                  @closed_issues_count ||= Issue.count(:all, :conditions => ["fixed_version_id = ? AND is_closed = ?", self.id, true], :include => :status)
                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
                # Versions are sorted by effective_date
                # Those with no effective_date are at the end, sorted by name
                def <=>(version)
                  if self.effective_date
                    version.effective_date ? (self.effective_date <=> version.effective_date) : -1
                  else
                    version.effective_date ? 1 : (self.name <=> version.name)
                  end
                end
              private
                def check_integrity
                  raise "Can't delete version" if self.fixed_issues.find(:first)
                end
              end

app/views/versions/_form.rhtml +1 -1

              <%= error_messages_for 'version' %>
              <div class="box">
-             <p><%= f.text_field :name, :size => 20, :required => true %></p>
+             <p><%= f.text_field :name, :size => 60, :required => true %></p>
              <p><%= f.text_field :description, :size => 60 %></p>
              <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
              <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
              </div>
              <% content_for :header_tags do %>
              <%= javascript_include_tag 'calendar/calendar' %>
              <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
              <%= javascript_include_tag 'calendar/calendar-setup' %>
              <%= stylesheet_link_tag 'calendar' %>
              <% 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