##// END OF EJS Templates
Do not query the database for project level on projects list....
Do not query the database for project level on projects list. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3599 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r3477:e6c8760ad77a
r3485:388805ad5838
Show More
issues_controller.rb
588 lines | 24.3 KiB | text/x-ruby | RubyLexer
/ app / controllers / issues_controller.rb
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Calendar....
r1796 # Redmine - project management software
# Copyright (C) 2006-2008 Jean-Philippe Lang
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 #
# 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
Jean-Philippe Lang
Added a 'New issue' link in the main menu (accesskey 7)....
r1067 menu_item :new_issue, :only => :new
Jean-Philippe Lang
Contextual quick search (#3263)....
r2829 default_search_scope :issues
Jean-Philippe Lang
Added a 'New issue' link in the main menu (accesskey 7)....
r1067
Eric Davis
Refactor: Start to extract IssuesController#edit into #update (REST)....
r3366 before_filter :find_issue, :only => [:show, :edit, :update, :reply]
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 before_filter :find_project, :only => [:new, :update_form, :preview, :auto_complete]
Jean-Philippe Lang
Enable tracker update on issue edit form (#2405)....
r2994 before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :context_menu]
Jean-Philippe Lang
Cross-project gantt and calendar (#1157)....
r2086 before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
Jean-Philippe Lang
Makes issues/show accept rss key (#3362)....
r2646 accept_key_auth :index, :show, :changes
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330
Jean-Philippe Lang
Rescue invalid query statement error with an error message....
r2990 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
Jean-Philippe Lang
Administrators can edit issue notes....
r1091 helper :journals
Jean-Philippe Lang
Fixed version field on issue view page now links to the corresponding version in the roadmap....
r559 helper :projects
include ProjectsHelper
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 helper :custom_fields
include CustomFieldsHelper
Jean-Philippe Lang
Issue relations first commit (not thoroughly tested). 4 kinds of relation are available:...
r503 helper :issue_relations
include IssueRelationsHelper
Jean-Philippe Lang
Added watchers for message boards (watchers controller modified to support any watchable model)....
r527 helper :watchers
include WatchersHelper
Jean-Philippe Lang
Attachments can now be added to wiki pages (original patch by Pavol Murin). Only authorized users can add/delete attachments....
r538 helper :attachments
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 include AttachmentsHelper
helper :queries
Jean-Philippe Lang
Fixed: PDF export of a issue list grouped by a custom field raises an error (#4600)....
r3219 include QueriesHelper
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 helper :sort
include SortHelper
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 include IssuesHelper
Jean-Philippe Lang
Addq "please select" to activity select box if no activity is set as default (#937)....
r1588 helper :timelog
Jean-Philippe Lang
Move PDF stuff to a single helper....
r2224 include Redmine::Export::PDF
Jean-Philippe Lang
data locking for issues...
r21
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 verify :method => [:post, :delete],
Jean-Philippe Lang
IssuesController#destroy accepts POST only (#4107)....
r2866 :only => :destroy,
:render => { :nothing => true, :status => :method_not_allowed }
Eric Davis
Verify issues are updated by HTTP PUT only. Regression from r3486....
r3406
verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 def index
retrieve_query
Jean-Philippe Lang
Ability to save "sort order" in custom queries (#2899)....
r2504 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
Jean-Philippe Lang
Fixed: Sorting a query on a value that isn't in the displayed columns fails (#3078)....
r2558 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
Jean-Philippe Lang
Validates sort_key and sort_order params (#2378)....
r2169
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 if @query.valid?
Jean-Philippe Lang
Fixed: invalid format parameter returns a DoubleRenderError on issues index (#4737)....
r3254 limit = case params[:format]
when 'csv', 'pdf'
Setting.issues_export_limit.to_i
when 'atom'
Setting.feeds_limit.to_i
else
per_page_option
Jean-Philippe Lang
Display links to Atom feeds (closes #496, #750)....
r1171 end
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989
@issue_count = @query.issue_count
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 @issue_pages = Paginator.new self, @issue_count, limit, params['page']
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
:order => sort_clause,
:offset => @issue_pages.current.offset,
:limit => limit)
@issue_count_by_group = @query.issue_count_by_group
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 respond_to do |format|
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 format.xml { render :layout => false }
Jean-Philippe Lang
Adds project name to issues feed title (#1323)....
r1627 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
Jean-Philippe Lang
Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV....
r2893 format.csv { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
Jean-Philippe Lang
Ticket grouping (#2679)....
r2604 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 end
else
# Send html if the query is not valid
render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 end
Jean-Philippe Lang
Queries can be marked as 'For all projects'. Such queries will be available on all projects and on the global issue list (#897, closes #671)....
r1296 rescue ActiveRecord::RecordNotFound
render_404
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 end
def changes
retrieve_query
Jean-Philippe Lang
Validates sort_key and sort_order params (#2378)....
r2169 sort_init 'id', 'desc'
Jean-Philippe Lang
Follows r2647....
r2559 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.available_columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
Jean-Philippe Lang
Validates sort_key and sort_order params (#2378)....
r2169
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 if @query.valid?
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
:limit => 25)
Jean-Philippe Lang
Added atom feed on the new cross-project issue list....
r675 end
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
render :layout => false, :content_type => 'application/atom+xml'
Jean-Philippe Lang
Queries can be marked as 'For all projects'. Such queries will be available on all projects and on the global issue list (#897, closes #671)....
r1296 rescue ActiveRecord::RecordNotFound
render_404
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 end
Jean-Philippe Lang
data locking for issues...
r21 def show
Jean-Philippe Lang
Issue history is now 'oldest first' sorted....
r627 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
Jean-Philippe Lang
Add a user preference to choose how comments/replies are displayed: in chronological or reverse chronological order (#589, #776)....
r1183 @journals.each_with_index {|j,i| j.indice = i+1}
@journals.reverse! if User.current.wants_comments_in_reverse_order?
Jean-Philippe Lang
Allow commits to reference issues of parent projects and subprojects (#4674)....
r3243 @changesets = @issue.changesets.visible.all
Jean-Philippe Lang
Sort changesets in the same order as comments on the issue details view (#1546)....
r2455 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
Jean-Philippe Lang
Merged IssuesController #edit and #update into a single actions....
r1115 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
Eric Davis
Changed Enumerations to use a Single Table Inheritance...
r2677 @priorities = IssuePriority.all
Jean-Philippe Lang
Fixed: IssueController#edit doesn't set default Activity as default (#1302)....
r1447 @time_entry = TimeEntry.new
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 respond_to do |format|
format.html { render :template => 'issues/show.rhtml' }
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 format.xml { render :layout => false }
Jean-Philippe Lang
Display links to Atom feeds (closes #496, #750)....
r1171 format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
Jean-Philippe Lang
Move PDF stuff to a single helper....
r2224 format.pdf { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
Jean-Philippe Lang
Merged IssuesController#export_pdf into IssuesController#show....
r799 end
Jean-Philippe Lang
data locking for issues...
r21 end
Jean-Philippe Lang
Initial commit...
r2
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 # Add a new issue
# The new issue will be created from an existing one if copy_from parameter is given
def new
Jean-Philippe Lang
Custom fields refactoring: most of code moved from controllers to models (using new module ActsAsCustomizable)....
r1578 @issue = Issue.new
@issue.copy_from(params[:copy_from]) if params[:copy_from]
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 @issue.project = @project
Jean-Philippe Lang
Fixed: issues always created with default tracker (#1553)....
r1596 # Tracker must be set before custom field values
@issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 if @issue.tracker.nil?
Azamat Hackimov
New strings for translation (fixes #2872), thanks for Enderson Maia for pointing and translation...
r2742 render_error l(:error_no_tracker_in_project)
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 return
end
Jean-Philippe Lang
Adds watchers selection on new issue form (#398). Permission 'add issue watchers' required....
r2162 if params[:issue].is_a?(Hash)
Jean-Philippe Lang
Set a white list of issue attributes that can be mass-assigned from controllers....
r3194 @issue.safe_attributes = params[:issue]
Jean-Philippe Lang
Adds watchers selection on new issue form (#398). Permission 'add issue watchers' required....
r2162 @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
end
Jean-Philippe Lang
Custom fields refactoring: most of code moved from controllers to models (using new module ActsAsCustomizable)....
r1578 @issue.author = User.current
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066
default_status = IssueStatus.default
unless default_status
Azamat Hackimov
New strings for translation (fixes #2872), thanks for Enderson Maia for pointing and translation...
r2742 render_error l(:error_no_default_issue_status)
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 return
end
@issue.status = default_status
Eric Davis
Refactor: use the existing Issue#new_statuses_allowed_to method....
r3419 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066
if request.get? || request.xhr?
@issue.start_date ||= Date.today
else
requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
# Check that the user is allowed to apply the requested status
@issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
Eric Davis
Added :controller_issues_new_before_save hook. (#4465)...
r3149 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 if @issue.save
Eric Davis
Refactor: Moved ApplicationController#attach_files to the Attachment model...
r3409 attachments = Attachment.attach_files(@issue, params[:attachments])
Eric Davis
Refactor: Decouple failed attachments and the flash messages...
r3414 render_attachment_warning_if_needed(@issue)
Jean-Philippe Lang
Reverts r3366....
r3253 flash[:notice] = l(:notice_successful_create)
Eric Davis
Added two new plugin hooks to IssuesController:...
r2259 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 respond_to do |format|
format.html {
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 redirect_to(params[:continue] ? { :action => 'new', :issue => {:tracker_id => @issue.tracker,
:parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 { :action => 'show', :id => @issue })
}
format.xml { render :action => 'show', :status => :created, :location => url_for(:controller => 'issues', :action => 'show', :id => @issue) }
end
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 return
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 else
respond_to do |format|
format.html { }
format.xml { render(:xml => @issue.errors, :status => :unprocessable_entity); return }
end
end
Jean-Philippe Lang
Reverts r3366....
r3253 end
Eric Davis
Changed Enumerations to use a Single Table Inheritance...
r2677 @priorities = IssuePriority.all
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 render :layout => !request.xhr?
end
Jean-Philippe Lang
Merged IssuesController #edit and #update into a single actions....
r1115 # Attributes that can be updated on workflow transition (without :edit permission)
# TODO: make it configurable (at least per role)
UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 def edit
Eric Davis
Refactor: Extracted the duplication from the last commit into a new method...
r3373 update_issue_from_params
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116
Eric Davis
Refactor: Replace @journal with @issue.current_journal...
r3426 @journal = @issue.current_journal
Eric Davis
Refactor: Move the updating of an Issue to the #update method....
r3372 respond_to do |format|
format.html { }
format.xml { }
end
end
def update
Eric Davis
Refactor: Extracted the duplication from the last commit into a new method...
r3373 update_issue_from_params
Eric Davis
Refactor: Move the updating of an Issue to the #update method....
r3372
Eric Davis
Refactor: Moved the contents of #issue_update into Issue....
r3431 if @issue.save_issue_with_child_records(params, @time_entry)
render_attachment_warning_if_needed(@issue)
Eric Davis
Remove double negative condition...
r3432 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
Eric Davis
Refactor: Moved the contents of #issue_update into Issue....
r3431
Eric Davis
Refactor: Extracted saving logic out of #update and into a utility method...
r3383 respond_to do |format|
format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
format.xml { head :ok }
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 end
Eric Davis
Refactor: Extracted saving logic out of #update and into a utility method...
r3383 else
Eric Davis
Refactor: Moved the contents of #issue_update into Issue....
r3431 render_attachment_warning_if_needed(@issue)
Eric Davis
Remove double negative condition...
r3432 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
Eric Davis
Refactor: Replace @journal with @issue.current_journal...
r3426 @journal = @issue.current_journal
Eric Davis
Refactor: Moved the contents of #issue_update into Issue....
r3431
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 respond_to do |format|
Eric Davis
Refactor: Start to extract IssuesController#edit into #update (REST)....
r3366 format.html { render :action => 'edit' }
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 format.xml { render :xml => @issue.errors, :status => :unprocessable_entity }
end
Jean-Philippe Lang
Merged IssuesController change_status and add_note actions....
r1030 end
Eric Davis
Refactor: Extracted saving logic out of #update and into a utility method...
r3383
Jean-Philippe Lang
Merged IssuesController change_status and add_note actions....
r1030 rescue ActiveRecord::StaleObjectError
# Optimistic locking exception
flash.now[:error] = l(:notice_locking_conflict)
Jean-Philippe Lang
Fixed: issue attachments are saved even if the issue has been updated by another user (#3846)....
r2761 # Remove the previously added attachments if issue was not updated
Eric Davis
Fixes destroying attachments if the update fails. (r2875 r3523)...
r3412 attachments[:files].each(&:destroy) if attachments[:files]
Jean-Philippe Lang
data locking for issues...
r21 end
Jean-Philippe Lang
Adds a Reply link to each issue note (#739). Reply is pre-filled with the quoted note....
r1466 def reply
journal = Journal.find(params[:journal_id]) if params[:journal_id]
if journal
user = journal.user
text = journal.notes
else
user = @issue.author
text = @issue.description
end
Jean-Philippe Lang
Fixed: Reply/Quote Function Newline Issue in Internet Explorer (#1362)....
r1487 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
Jean-Philippe Lang
Adds a Reply link to each issue note (#739). Reply is pre-filled with the quoted note....
r1466 render(:update) { |page|
Jean-Philippe Lang
Fixed: Reply/Quote Function Newline Issue in Internet Explorer (#1362)....
r1487 page.<< "$('notes').value = \"#{content}\";"
Jean-Philippe Lang
Adds a Reply link to each issue note (#739). Reply is pre-filled with the quoted note....
r1466 page.show 'update'
page << "Form.Element.focus('notes');"
page << "Element.scrollTo('update');"
page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
}
end
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 # Bulk edit a set of issues
def bulk_edit
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @issues.sort!
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 if request.post?
Jean-Philippe Lang
Bulk edit refactoring....
r3364 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116
Jean-Philippe Lang
Bulk edit refactoring....
r3364 unsaved_issue_ids = []
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 @issues.each do |issue|
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 issue.reload
Jean-Philippe Lang
Bulk edit refactoring....
r3364 journal = issue.init_journal(User.current, params[:notes])
issue.safe_attributes = attributes
call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
unless issue.save
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 # Keep unsaved issue ids to display them in flash error
unsaved_issue_ids << issue.id
end
end
Eric Davis
Refactor: Extract method for setting the flash on bulk issue saves....
r3446 set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
Eric Davis
Cleaned up the IssueController redirects to use the back_url like the other actions....
r3201 redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 return
end
Eric Davis
Enhanced the Issue Bulk Copy feature:...
r3008 @available_statuses = Workflow.available_statuses(@project)
Jean-Philippe Lang
Allow bulk edit custom fields of any type (#461)....
r3164 @custom_fields = @project.all_issue_custom_fields
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 end
def move
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @issues.sort!
Eric Davis
Enhanced the Issue Bulk Copy feature:...
r3008 @copy = params[:copy_options] && params[:copy_options][:copy]
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 @allowed_projects = []
# find projects to which the user is allowed to move the issue
if User.current.admin?
# admin is allowed to move issues to any active (visible) project
Jean-Philippe Lang
Render the project list as a tree on Move form....
r2313 @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 else
Jean-Philippe Lang
Fixed: issue move by non-admin broken by r2726 (#3354)....
r2639 User.current.memberships.each {|m| @allowed_projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 end
@target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
@target_project ||= @project
@trackers = @target_project.trackers
Eric Davis
Enhanced the Issue Bulk Copy feature:...
r3008 @available_statuses = Workflow.available_statuses(@project)
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 if request.post?
new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
unsaved_issue_ids = []
Jean-Philippe Lang
Adds a 'Move and follow' button on Move/Copy view to be redirected to the created issue(s) rather than the source project issue list (#1847)....
r2949 moved_issues = []
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 @issues.each do |issue|
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 issue.reload
Eric Davis
Enhanced the Issue Bulk Copy feature:...
r3008 changed_attributes = {}
[:assigned_to_id, :status_id, :start_date, :due_date].each do |valid_attribute|
Jean-Philippe Lang
Fixes that issue copy/move throws an error when status is not changed (#4369)....
r3034 unless params[valid_attribute].blank?
changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
end
Eric Davis
Enhanced the Issue Bulk Copy feature:...
r3008 end
Jean-Philippe Lang
Track project and tracker changes in issue history....
r1551 issue.init_journal(User.current)
Jean-Philippe Lang
Adds a controller hook before issue move (#4850)....
r3343 call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => changed_attributes})
Jean-Philippe Lang
Adds a 'Move and follow' button on Move/Copy view to be redirected to the created issue(s) rather than the source project issue list (#1847)....
r2949 moved_issues << r
else
unsaved_issue_ids << issue.id
end
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 end
Eric Davis
Refactor: Extract method for setting the flash on bulk issue saves....
r3446 set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
Jean-Philippe Lang
Adds a 'Move and follow' button on Move/Copy view to be redirected to the created issue(s) rather than the source project issue list (#1847)....
r2949 if params[:follow]
if @issues.size == 1 && moved_issues.size == 1
redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
else
redirect_to :controller => 'issues', :action => 'index', :project_id => (@target_project || @project)
end
else
redirect_to :controller => 'issues', :action => 'index', :project_id => @project
end
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 return
end
render :layout => false if request.xhr?
end
Jean-Philippe Lang
data locking for issues...
r21 def destroy
Jean-Philippe Lang
Let the user choose when deleting issues with reported hours (closes #734, #71):...
r1168 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
if @hours > 0
case params[:todo]
when 'destroy'
# nothing to do
when 'nullify'
TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
when 'reassign'
reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
if reassign_to.nil?
flash.now[:error] = l(:error_issue_not_found_in_project)
return
else
TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
end
else
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 unless params[:format] == 'xml'
# display the destroy form if it's a user request
return
end
Jean-Philippe Lang
Let the user choose when deleting issues with reported hours (closes #734, #71):...
r1168 end
end
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 @issues.each(&:destroy)
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 respond_to do |format|
format.html { redirect_to :action => 'index', :project_id => @project }
format.xml { head :ok }
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 end
Jean-Philippe Lang
Added AJAX based context menu on the project issue list that provide shortcuts for editing, re-assigning, changing the status or the priority, moving or deleting an issue....
r859
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 def gantt
@gantt = Redmine::Helpers::Gantt.new(params)
retrieve_query
Jean-Philippe Lang
Fixed: error raised when trying to view the gantt or calendar with a grouped query (#4751)....
r3265 @query.group_by = nil
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 if @query.valid?
events = []
# Issues that have start and due dates
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
:order => "start_date, due_date",
:conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
)
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 # Issues that don't have a due date but that are assigned to a version with a date
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 events += @query.issues(:include => [:tracker, :assigned_to, :priority, :fixed_version],
:order => "start_date, effective_date",
:conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
)
Jean-Philippe Lang
Changes versions retrieval on gantt chart....
r1797 # Versions
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
Jean-Philippe Lang
Changes versions retrieval on gantt chart....
r1797
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 @gantt.events = events
end
Jean-Philippe Lang
Slight gantt export refactoring (#3229)....
r2598 basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 respond_to do |format|
format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
Jean-Philippe Lang
Slight gantt export refactoring (#3229)....
r2598 format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Gantt chart....
r1795 end
end
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Calendar....
r1796 def calendar
if params[:year] and params[:year].to_i > 1900
@year = params[:year].to_i
if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
@month = params[:month].to_i
end
end
@year ||= Date.today.year
@month ||= Date.today.month
@calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
retrieve_query
Jean-Philippe Lang
Fixed: error raised when trying to view the gantt or calendar with a grouped query (#4751)....
r3265 @query.group_by = nil
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Calendar....
r1796 if @query.valid?
events = []
Jean-Philippe Lang
Move issues, journals, versions queries from IssuesController to Query model....
r2989 events += @query.issues(:include => [:tracker, :assigned_to, :priority],
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
)
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
Jean-Philippe Lang
Adds support for free ticket filtering and custom queries on Calendar....
r1796
@calendar.events = events
end
render :layout => false if request.xhr?
end
Jean-Philippe Lang
Added AJAX based context menu on the project issue list that provide shortcuts for editing, re-assigning, changing the status or the priority, moving or deleting an issue....
r859 def context_menu
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
if (@issues.size == 1)
@issue = @issues.first
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
end
projects = @issues.collect(&:project).compact.uniq
@project = projects.first if projects.size == 1
@can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
Jean-Philippe Lang
Fixes r1672....
r1656 :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
Jean-Philippe Lang
One-click bulk edition using the issue list context menu within the same project (#1770)....
r1764 :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 :move => (@project && User.current.allowed_to?(:move_issues, @project)),
:copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
:delete => (@project && User.current.allowed_to?(:delete_issues, @project))
}
Jean-Philippe Lang
One-click bulk edition using the issue list context menu within the same project (#1770)....
r1764 if @project
@assignables = @project.assignable_users
@assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
Jean-Philippe Lang
Fixes context menu broken by r3109 (#2405)....
r2997 @trackers = @project.trackers
Jean-Philippe Lang
One-click bulk edition using the issue list context menu within the same project (#1770)....
r1764 end
Eric Davis
Changed Enumerations to use a Single Table Inheritance...
r2677 @priorities = IssuePriority.all.reverse
Jean-Philippe Lang
Added AJAX based context menu on the project issue list that provide shortcuts for editing, re-assigning, changing the status or the priority, moving or deleting an issue....
r859 @statuses = IssueStatus.find(:all, :order => 'position')
Jean-Philippe Lang
Redirect to the current page when using context menu on the issue list (#4184)....
r2913 @back = params[:back_url] || request.env['HTTP_REFERER']
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116
Jean-Philippe Lang
Added AJAX based context menu on the project issue list that provide shortcuts for editing, re-assigning, changing the status or the priority, moving or deleting an issue....
r859 render :layout => false
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 def update_form
Jean-Philippe Lang
Fixed: error when changing tracker on the new issue form (#4345)....
r3011 if params[:id].blank?
Jean-Philippe Lang
Enable tracker update on issue edit form (#2405)....
r2994 @issue = Issue.new
@issue.project = @project
Jean-Philippe Lang
Fixed: error when changing tracker on the new issue form (#4345)....
r3011 else
@issue = @project.issues.visible.find(params[:id])
Jean-Philippe Lang
Enable tracker update on issue edit form (#2405)....
r2994 end
@issue.attributes = params[:issue]
@allowed_statuses = ([@issue.status] + @issue.status.find_new_statuses_allowed_to(User.current.roles_for_project(@project), @issue.tracker)).uniq
@priorities = IssuePriority.all
render :partial => 'attributes'
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 end
Jean-Philippe Lang
Added preview on add/edit issue form....
r801 def preview
Jean-Philippe Lang
Fixed: trying to preview a new issue raises an exception (closes #984)....
r1341 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
Jean-Philippe Lang
Fixed: preview fails when updating an issue (broken by r1322). Patch #1027....
r1326 @attachements = @issue.attachments if @issue
Jean-Philippe Lang
Merged IssuesController #edit and #update into a single actions....
r1115 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
Jean-Philippe Lang
Added preview on add/edit issue form....
r801 render :partial => 'common/preview'
end
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 def auto_complete
@issues = []
q = params[:q].to_s
if q.match(/^\d+$/)
@issues << @project.issues.visible.find_by_id(q.to_i)
end
unless q.blank?
@issues += @project.issues.visible.find(:all, :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE ?", "%#{q.downcase}%"], :limit => 10)
end
render :layout => false
end
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 private
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 def find_issue
Jean-Philippe Lang
added svn:eol-style native property on /app files...
r330 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
@project = @issue.project
rescue ActiveRecord::RecordNotFound
render_404
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 end
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 # Filter for bulk operations
def find_issues
@issues = Issue.find_all_by_id(params[:id] || params[:ids])
raise ActiveRecord::RecordNotFound if @issues.empty?
projects = @issues.collect(&:project).compact.uniq
if projects.size == 1
@project = projects.first
else
# TODO: let users bulk edit/move/destroy issues from different projects
Jean-Philippe Lang
Removes "xxx and return" calls (#4446)....
r3071 render_error 'Can not bulk edit/move/destroy issues from different projects'
return false
Jean-Philippe Lang
Issue list now supports bulk edit/move/delete (#563, #607). For now, issues from different projects can not be bulk edited/moved/deleted at once....
r1116 end
rescue ActiveRecord::RecordNotFound
render_404
end
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 def find_project
Jean-Philippe Lang
XML REST API for issues that provides CRUD operations for Issues (#1214)....
r3196 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
@project = Project.find(project_id)
Jean-Philippe Lang
ProjectsController#add_issue moved to IssuesController#new....
r1066 rescue ActiveRecord::RecordNotFound
render_404
end
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 def find_optional_project
Jean-Philippe Lang
Cross-project gantt and calendar (#1157)....
r2086 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
allowed ? true : deny_access
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 rescue ActiveRecord::RecordNotFound
render_404
end
Eric Davis
Refactor: Split the find_object methods to prep for a larger refactoring....
r3477
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 # Retrieve query from session or build a new query
def retrieve_query
Jean-Philippe Lang
Fixed an error on issue feeds....
r1092 if !params[:query_id].blank?
Jean-Philippe Lang
Queries can be marked as 'For all projects'. Such queries will be available on all projects and on the global issue list (#897, closes #671)....
r1296 cond = "project_id IS NULL"
cond << " OR project_id = #{@project.id}" if @project
@query = Query.find(params[:query_id], :conditions => cond)
@query.project = @project
Jean-Philippe Lang
Do not store query object in session but id or filters only. This allows to use Rails 2.0 cookie based sessions....
r1014 session[:query] = {:id => @query.id, :project_id => @query.project_id}
Jean-Philippe Lang
Ability to save "sort order" in custom queries (#2899)....
r2504 sort_clear
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 else
Jean-Philippe Lang
Accept filters from API calls without set_filter parameter....
r3221 if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 # Give it a name, required to be valid
Jean-Philippe Lang
Anonymous users can now be allowed to create, edit, comment issues, comment news and post messages in the forums....
r906 @query = Query.new(:name => "_")
Jean-Philippe Lang
ProjectsController#list_issues, #export_issues_csv and #export_issues_pdf merged into IssuesController#index...
r874 @query.project = @project
if params[:fields] and params[:fields].is_a? Array
params[:fields].each do |field|
@query.add_filter(field, params[:operators][field], params[:values][field])
end
else
@query.available_filters.keys.each do |field|
@query.add_short_filter(field, params[field]) if params[field]
end
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 end
Jean-Philippe Lang
Ticket grouping (#2679)....
r2604 @query.group_by = params[:group_by]
Jean-Philippe Lang
Adds dynamic columns selection on the issue list (#4272)....
r2991 @query.column_names = params[:query] && params[:query][:column_names]
session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 else
Jean-Philippe Lang
Do not store query object in session but id or filters only. This allows to use Rails 2.0 cookie based sessions....
r1014 @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
Jean-Philippe Lang
Adds dynamic columns selection on the issue list (#4272)....
r2991 @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
Jean-Philippe Lang
Issue list shows all tickets when going back to a global query inside a project (closes #1055)....
r1337 @query.project = @project
Jean-Philippe Lang
Added a cross-project issue list. It displays the issues of all the projects visible by the user....
r673 end
end
end
Jean-Philippe Lang
Rescue invalid query statement error with an error message....
r2990
# Rescues an invalid query statement. Just in case...
def query_statement_invalid(exception)
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query)
sort_clear
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
end
Eric Davis
Refactor: Extracted the duplication from the last commit into a new method...
r3373
# Used by #edit and #update to set some common instance variables
# from the params
# TODO: Refactor, not everything in here is needed by #edit
def update_issue_from_params
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@priorities = IssuePriority.all
@edit_allowed = User.current.allowed_to?(:edit_issues, @project)
@time_entry = TimeEntry.new
@notes = params[:notes]
Eric Davis
Refactor: Replace @journal with @issue.current_journal...
r3426 @issue.init_journal(User.current, @notes)
Eric Davis
Refactor: Extracted the duplication from the last commit into a new method...
r3373 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
attrs = params[:issue].dup
attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
@issue.safe_attributes = attrs
end
end
Eric Davis
Refactor: Extract method for setting the flash on bulk issue saves....
r3446
def set_flash_from_bulk_issue_save(issues, unsaved_issue_ids)
if unsaved_issue_ids.empty?
flash[:notice] = l(:notice_successful_update) unless issues.empty?
else
flash[:error] = l(:notice_failed_to_save_issues,
:count => unsaved_issue_ids.size,
:total => issues.size,
:ids => '#' + unsaved_issue_ids.join(', #'))
end
end
Jean-Philippe Lang
Initial commit...
r2 end