jro_apps/redmine Commit - r507:71e6f22670fe

Issue#long_id no more used and removed...

Jean-Philippe Lang -

r507:71e6f22670fe

parent child

Context file:

r507:71e6f22670fe

Collapse all files

app/controllers/issues_controller.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 IssuesController < ApplicationController
               layout 'base', :except => :export_pdf
               before_filter :find_project, :authorize
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               def show
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @journals_count = @issue.journals.count
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
               end
               def history
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
                 @journals_count = @journals.length
               end
               def export_pdf
                 @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
                 @options_for_rfpdf ||= {}
-                @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
+                @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
               end
               def edit
                 @priorities = Enumeration::get_values('IPRI')
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   begin
                     @issue.init_journal(self.logged_in_user)
                     # Retrieve custom fields and values
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                     @issue.attributes = params[:issue]
                     if @issue.save
                       flash[:notice] = l(:notice_successful_update)
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
               end
               def add_note
                 unless params[:notes].empty?
                   journal = @issue.init_journal(self.logged_in_user, params[:notes])
                   if @issue.save
                     flash[:notice] = l(:notice_successful_update)
                     Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                     redirect_to :action => 'show', :id => @issue
                     return
                   end
                 end
                 show
                 render :action => 'show'
               end
               def change_status
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
                 @new_status = IssueStatus.find(params[:new_status_id])
                 if params[:confirm]
                   begin
                     journal = @issue.init_journal(self.logged_in_user, params[:notes])
                     @issue.status = @new_status
                     if @issue.update_attributes(params[:issue])
                       # Save attachments
                       params[:attachments].each { |file|
                         next unless file.size > 0
                         a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
                         journal.details << JournalDetail.new(:property => 'attachment',
                                                              :prop_key => a.id,
                                                              :value => a.filename) unless a.new_record?
                       } if params[:attachments] and params[:attachments].is_a? Array
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                       redirect_to :action => 'show', :id => @issue
                     end
                   rescue ActiveRecord::StaleObjectError
                     # Optimistic locking exception
                     flash[:notice] = l(:notice_locking_conflict)
                   end
                 end
                 @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
               end
               def destroy
                 @issue.destroy
                 redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
               end
               def add_attachment
                 # Save the attachments
                 @attachments = []
                 journal = @issue.init_journal(self.logged_in_user)
                 params[:attachments].each { |file|
                   next unless file.size > 0
                   a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
                   @attachments << a unless a.new_record?
                   journal.details << JournalDetail.new(:property => 'attachment',
                                                        :prop_key => a.id,
                                                        :value => a.filename) unless a.new_record?
                 } if params[:attachments] and params[:attachments].is_a? Array
                 journal.save if journal.details.any?
                 Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                 redirect_to :action => 'show', :id => @issue
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(self.logged_in_user)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 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])
                 @project = @issue.project
                 @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/issue.rb 0 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  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 Issue < ActiveRecord::Base
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'Enumeration', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :attachments, :as => :container, :dependent => :destroy
               has_many :time_entries
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_many :custom_fields, :through => :custom_values
               has_and_belongs_to_many :changesets, :order => "revision ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_watchable
               validates_presence_of :subject, :description, :priority, :tracker, :author, :status
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_associated :custom_values, :on => :update
               # set default status for new issues
               def before_validation
                 self.status = IssueStatus.default if status.nil?
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :activerecord_error_not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :activerecord_error_greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :activerecord_error_invalid
                 end
               end
               def before_save
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id description)).each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c)) unless send(c)==@issue_before_change.send(c)
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
                   }
                   @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
                 end
               end
               def after_save
                 relations_from.each(&:set_issue_to_dates)
-              end
-              def long_id
-                "%05d" % self.id
               end
               def custom_value_for(custom_field)
                 self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
                 return nil
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 @current_journal
               end
               def spent_hours
                 @spent_hours ||= time_entries.sum(:hours) || 0
               end
               def relations
                 (relations_from + relations_to).sort
               end
               def all_dependent_issues
                 dependencies = []
                 relations_from.each do |relation|
                   dependencies << relation.issue_to
                   dependencies += relation.issue_to.all_dependent_issues
                 end
                 dependencies
               end
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
               end
             end

app/views/issues/_pdf.rfpdf +1 -1

             <%	pdf.SetFontStyle('B',11)
-               	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.long_id} - #{issue.subject}")
+               	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.id}: #{issue.subject}")
                 pdf.Ln
                 y0 = pdf.GetY
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_status) + ":","LT")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, issue.status.name,"RT")
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_priority) + ":","LT")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, issue.priority.name,"RT")
                 pdf.Ln
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_author) + ":","L")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, issue.author.name,"R")
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_category) + ":","L")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, (issue.category ? issue.category.name : "-"),"R")
                 pdf.Ln
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_created_on) + ":","L")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, format_date(issue.created_on),"R")
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, (issue.assigned_to ? issue.assigned_to.name : "-"),"R")
                 pdf.Ln
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, format_date(issue.updated_on),"RB")
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_due_date) + ":","LB")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(60,5, format_date(issue.due_date),"RB")
                 pdf.Ln
             	for custom_value in issue.custom_values
             	    pdf.SetFontStyle('B',9)
             	    pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
             	    pdf.SetFontStyle('',9)
             	    pdf.MultiCell(155,5, (show_value custom_value),"R")
             	end
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_subject) + ":","LTB")
                 pdf.SetFontStyle('',9)
                 pdf.Cell(155,5, issue.subject,"RTB")
                 pdf.Ln
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(35,5, l(:field_description) + ":")
                 pdf.SetFontStyle('',9)
                 pdf.MultiCell(155,5, issue.description,"BR")
                 pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
             	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
                 pdf.Ln
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(190,5, l(:label_history), "B")
                 pdf.Ln
             	for journal in issue.journals.find(:all, :include => :user, :order => "journals.created_on desc")
             		pdf.SetFontStyle('B',8)
             	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
             	    pdf.Ln
             		pdf.SetFontStyle('I',8)
             		for detail in journal.details
             			pdf.Cell(190,5, "- " + show_detail(detail, true))
             			pdf.Ln
             		end
             		if journal.notes?
             			pdf.SetFontStyle('',8)
             			pdf.MultiCell(190,5, journal.notes)
             		end
             		pdf.Ln
             	end
                 pdf.SetFontStyle('B',9)
                 pdf.Cell(190,5, l(:label_attachment_plural), "B")
             	pdf.Ln
             	for attachment in issue.attachments
             		pdf.SetFontStyle('',8)
             	    pdf.Cell(80,5, attachment.filename)
             		pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
             		pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
             		pdf.Cell(65,5, attachment.author.name,0,0,"R")
             		pdf.Ln
             	end
             %>

app/views/projects/move_issues.rhtml +1 -1

             <h2><%=l(:button_move)%></h2>
             <% form_tag({:action => 'move_issues', :id => @project}, :class => "tabular") do %>
             <div class="box">
             <p><label><%= l(:label_issue_plural) %>:</label>
             <% for issue in @issues %>
-                <b><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></b> - <%=h issue.subject %>
+                <%= link_to_issue issue %>: <%=h issue.subject %>
                 <%= hidden_field_tag "issue_ids[]", issue.id %><br />
             <% end %>
             <i>(<%= @issues.length%> <%= lwr(:label_issue, @issues.length)%>)</i></p>
             &nbsp;
             <!--[form:issue]-->
             <p><label for="new_project_id"><%=l(:field_project)%></label>
             <%= select_tag "new_project_id", options_from_collection_for_select(@projects, "id", "name", @project.id) %></p>
             <p><label for="new_tracker_id"><%=l(:field_tracker)%></label>
             <%= select_tag "new_tracker_id", options_from_collection_for_select(@trackers, "id", "name") %></p>
             </div>
             <%= submit_tag l(:button_move) %>
             <% 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