mirror of
https://github.com/rickbarrette/redmine_qbo_calendar.git
synced 2026-11-17 21:50:37 -05:00
Add a default project setting for issues created from estimates
Redmine has no default-project setting for new issues, so the preview page used the first project the user could add issues to whenever an appointment had no project. The plugin settings now have a Default project; the order is: project chosen on the page, the appointment's project, the default project, then the first allowed project. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BiwYMjhoQvL7XsKKfRz4pM
This commit is contained in:
5 files changed
+20
-3
No files matched your search
@@ -160,14 +160,16 @@ class CustomerAppointmentsController < ApplicationController
|
|||||||
@builder = RedmineQboCalendar::EstimateIssueBuilder.new(@appointment)
|
@builder = RedmineQboCalendar::EstimateIssueBuilder.new(@appointment)
|
||||||
@available_projects = Project.allowed_to(User.current, :add_issues).sorted.to_a
|
@available_projects = Project.allowed_to(User.current, :add_issues).sorted.to_a
|
||||||
|
|
||||||
# A project chosen on the page wins, then the appointment's project, then the first allowed one
|
# A project chosen on the page wins, then the appointment's project, then the default project
|
||||||
|
# from the plugin settings, then the first project the user can add issues to
|
||||||
|
default_project = @available_projects.detect { |p| p.id == RedmineQboCalendar::EstimateIssueBuilder.default_project_id }
|
||||||
@target_project =
|
@target_project =
|
||||||
if @project
|
if @project
|
||||||
@project if @available_projects.include?(@project)
|
@project if @available_projects.include?(@project)
|
||||||
elsif @available_projects.include?(@appointment.project)
|
elsif @available_projects.include?(@appointment.project)
|
||||||
@appointment.project
|
@appointment.project
|
||||||
else
|
else
|
||||||
@available_projects.first
|
default_project || @available_projects.first
|
||||||
end
|
end
|
||||||
return deny_access unless @target_project
|
return deny_access unless @target_project
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,15 @@
|
|||||||
<em class="info"><%= l(:text_estimate_item_codes_info) %></em>
|
<em class="info"><%= l(:text_estimate_item_codes_info) %></em>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<label for="settings_default_project_id"><%= l(:label_default_project) %></label>
|
||||||
|
<%= select_tag 'settings[default_project_id]',
|
||||||
|
project_tree_options_for_select(Project.active.sorted,
|
||||||
|
selected: Project.find_by(id: settings['default_project_id'].to_i)),
|
||||||
|
include_blank: true, id: 'settings_default_project_id' %>
|
||||||
|
<em class="info"><%= l(:text_default_project_info) %></em>
|
||||||
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<label for="settings_default_tracker_id"><%= l(:label_default_tracker) %></label>
|
<label for="settings_default_tracker_id"><%= l(:label_default_tracker) %></label>
|
||||||
<%= select_tag 'settings[default_tracker_id]',
|
<%= select_tag 'settings[default_tracker_id]',
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ en:
|
|||||||
label_edit_appointment: Edit Appointment
|
label_edit_appointment: Edit Appointment
|
||||||
label_end_date: End Date
|
label_end_date: End Date
|
||||||
label_estimated_hours: Estimated Time
|
label_estimated_hours: Estimated Time
|
||||||
|
label_default_project: "Default project"
|
||||||
label_default_tracker: "Default tracker"
|
label_default_tracker: "Default tracker"
|
||||||
label_estimate_issue_settings: "Issues from estimates"
|
label_estimate_issue_settings: "Issues from estimates"
|
||||||
label_estimate_issue_fields: "Issue fields"
|
label_estimate_issue_fields: "Issue fields"
|
||||||
@@ -102,6 +103,7 @@ en:
|
|||||||
permission_edit_customer_appointments: "Edit customer appointments"
|
permission_edit_customer_appointments: "Edit customer appointments"
|
||||||
permission_manage_customer_appointments: Manage Customer Appointments
|
permission_manage_customer_appointments: Manage Customer Appointments
|
||||||
permission_view_customer_appointments: "View customer appointments"
|
permission_view_customer_appointments: "View customer appointments"
|
||||||
|
text_default_project_info: "Where issues from estimates are created when the appointment has no project. Users who can't add issues there get their first allowed project. It can still be changed on the preview page."
|
||||||
text_default_tracker_info: "Pre-selected for each proposed issue. Leave blank to use the project's first tracker."
|
text_default_tracker_info: "Pre-selected for each proposed issue. Leave blank to use the project's first tracker."
|
||||||
text_estimate_issue_fields_info: "Entered once and applied to every created issue whose tracker uses the field. Fields marked * are required by the selected trackers."
|
text_estimate_issue_fields_info: "Entered once and applied to every created issue whose tracker uses the field. Fields marked * are required by the selected trackers."
|
||||||
text_estimate_issues_hint: "The subject comes from the estimate line's description and estimated hours from its quantity. Edit anything before creating. New issues are related to each other and to issues already created from this estimate."
|
text_estimate_issues_hint: "The subject comes from the estimate line's description and estimated hours from its quantity. Edit anything before creating. New issues are related to each other and to issues already created from this estimate."
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ Redmine::Plugin.register :redmine_qbo_calendar do
|
|||||||
requires_redmine version_or_higher: '7.0.0'
|
requires_redmine version_or_higher: '7.0.0'
|
||||||
|
|
||||||
# Item codes: which QBO estimate items can become issues (e.g. Labor, Alignments)
|
# Item codes: which QBO estimate items can become issues (e.g. Labor, Alignments)
|
||||||
settings default: { 'item_codes' => "Labor", 'default_tracker_id' => '' },
|
settings default: { 'item_codes' => "Labor", 'default_tracker_id' => '', 'default_project_id' => '' },
|
||||||
partial: 'settings/qbo_calendar_settings'
|
partial: 'settings/qbo_calendar_settings'
|
||||||
|
|
||||||
# Add Holidays index to the Redmine Administration Menu
|
# Add Holidays index to the Redmine Administration Menu
|
||||||
|
|||||||
@@ -39,6 +39,10 @@ module RedmineQboCalendar
|
|||||||
settings['default_tracker_id'].to_i
|
settings['default_tracker_id'].to_i
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.default_project_id
|
||||||
|
settings['default_project_id'].to_i
|
||||||
|
end
|
||||||
|
|
||||||
def self.settings
|
def self.settings
|
||||||
Setting.plugin_redmine_qbo_calendar || {}
|
Setting.plugin_redmine_qbo_calendar || {}
|
||||||
rescue StandardError
|
rescue StandardError
|
||||||
|
|||||||
Reference in new issue
Block a user