+
<%= h note_template.name %>
@@ -85,6 +85,6 @@
+<% end %>
<%= render partial: 'common/template_links' %>
-
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5f2543e5..1291f185 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -38,6 +38,7 @@ ja:
label_should_replaced_help_message: "オプションをチェックすると、テンプレートを適用する際に、入力済みの本文とタイトルを上書きします。（デフォルトはOFFです）"
global_issue_templates: "グローバル チケットテンプレート"
no_issue_templates_for_this_redmine: "このRedmineにはグローバルチケットテンプレートは定義されていません。"
+ no_note_templates_for_this_redmine: "このRedmineにはグローバルコメント用テンプレートは定義されていません。"
only_admin_can_associate_global_template: "このプロジェクトでグローバルチケットテンプレートを利用するには、Redmine管理者権限が必要です。"
text_no_tracker_enabled_for_global: "テンプレートはトラッカー毎に設定します。\nトラッカーの設定をお願いします。"
display_and_filter_issue_templates_in_dialog: "テンプレートの内容を確認"
diff --git a/db/migrate/20230330055341_change_global_note_template_projects_table_name.rb b/db/migrate/20230330055341_change_global_note_template_projects_table_name.rb
new file mode 100644
index 00000000..7a64f0e7
--- /dev/null
+++ b/db/migrate/20230330055341_change_global_note_template_projects_table_name.rb
@@ -0,0 +1,9 @@
+class ChangeGlobalNoteTemplateProjectsTableName < ActiveRecord::Migration[5.2]
+ def up
+ rename_table :global_note_template_projects, :global_note_templates_projects
+ end
+
+ def down
+ rename_table :global_note_templates_projects, :global_note_template_projects
+ end
+end
diff --git a/spec/features/issue_template_spec.rb b/spec/features/issue_template_spec.rb
index 3ba3b7f1..a888aea4 100644
--- a/spec/features/issue_template_spec.rb
+++ b/spec/features/issue_template_spec.rb
@@ -97,7 +97,7 @@
end
scenario 'create template failed' do
- expect(error_message).to have_content('Title cannot be blank')
+ expect(error_message).to have_content('Template name cannot be blank')
end
end
diff --git a/spec/features/update_issue_spec.rb b/spec/features/update_issue_spec.rb
index 55e461f6..8d5f5061 100644
--- a/spec/features/update_issue_spec.rb
+++ b/spec/features/update_issue_spec.rb
@@ -132,6 +132,31 @@
end
end
end
+
+ end
+
+ context 'Have disabled note templates' do
+ background do
+ FactoryBot.rewind_sequences
+ FactoryBot.create_list(
+ :note_template, 3, project_id: project.id, tracker_id: tracker.id, visibility: :open, enabled: false
+ )
+ end
+
+ scenario 'Disabled Templates would not to be shown.' do
+ template_list = NoteTemplate.visible_note_templates_condition(
+ user_id: user.id, project_id: project.id, tracker_id: tracker.id
+ )
+ expect(template_list).to be_empty
+
+ visit_update_issue(user)
+ issue = Issue.last
+ visit "/issues/#{issue.id}"
+
+ page.find('#content > div:nth-child(1) > a.icon.icon-edit').click
+ sleep(0.2)
+ expect(page).to have_no_selector('a#link_template_issue_notes_dialog')
+ end
end
context 'Have global note template' do
@@ -222,6 +247,29 @@
end
end
+ context 'Have disabled global note templates' do
+ before do
+ Setting.send 'plugin_redmine_issue_templates=', 'apply_global_template_to_all_projects' => 'true'
+ create_list(
+ :global_note_template, 3, tracker_id: tracker.id, name: 'Global Note Template name', visibility: 2, enabled: false
+ )
+ end
+
+ scenario 'Disabled global note templates would not be show' do
+ template_list = GlobalNoteTemplate.visible_note_templates_condition(
+ user_id: user.id, project_id: project.id, tracker_id: tracker.id
+ )
+ expect(template_list).to be_empty
+
+ visit_update_issue(user)
+ issue = Issue.last
+ visit "/issues/#{issue.id}"
+ page.find('#content > div:nth-child(1) > a.icon.icon-edit').click
+ sleep(0.2)
+ expect(page).to have_no_selector('a#link_template_issue_notes_dialog')
+ end
+ end
+
private
def visit_update_issue(user)
diff --git a/spec/features/update_template_spec.rb b/spec/features/update_template_spec.rb
new file mode 100644
index 00000000..2641e728
--- /dev/null
+++ b/spec/features/update_template_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require_relative '../spec_helper'
+require_relative '../rails_helper'
+require_relative '../support/login_helper'
+
+RSpec.configure do |c|
+ c.include LoginHelper
+end
+
+feature 'Update template', js: true do
+ given(:user) { FactoryBot.create(:user, :password_same_login, login: 'test-manager', language: 'en', admin: false) }
+ given(:project) { FactoryBot.create(:project_with_enabled_modules) }
+ given(:tracker) { FactoryBot.create(:tracker, :with_default_status) }
+ given(:role) { FactoryBot.create(:role, :manager_role) }
+ given(:status) { IssueStatus.create(name: 'open', is_closed: false) }
+ given(:expected_note_description) { 'Note Template desctiption' }
+ given!(:template) {
+ NoteTemplate.create(project_id: project.id, tracker_id: tracker.id,
+ name: 'Note Template name', description: expected_note_description, enabled: true)
+ }
+
+ background(:all) do
+ Redmine::Plugin.register(:redmine_issue_templates) do
+ settings partial: 'settings/redmine_issue_templates',
+ default: { 'apply_global_template_to_all_projects' => 'false', 'apply_template_when_edit_issue' => 'true' }
+ end
+ end
+
+ background do
+ project.trackers << tracker
+
+ priority = IssuePriority.create(
+ name: 'Low',
+ position: 1, is_default: false, type: 'IssuePriority', active: true, project_id: nil, parent_id: nil,
+ position_name: 'lowest'
+ )
+
+ member = Member.new(project: project, user_id: user.id)
+ member.member_roles << MemberRole.new(role: role)
+ member.save
+
+ Issue.create(project_id: project.id, tracker_id: tracker.id,
+ author_id: user.id,
+ priority: priority,
+ subject: 'test_create',
+ status_id: status.id,
+ description: 'IssueTest#test_create')
+ end
+
+ context 'Have show_issue_template permission' do
+
+ background do
+ assign_template_priv(role, add_permission: :show_issue_templates)
+ end
+
+ scenario 'Cannot edit the template, only view it' do
+ visit_log_user(user)
+ visit "/projects/#{project.identifier}/note_templates/#{template.id}"
+ sleep(0.2)
+ expect(page).to have_no_selector('div#edit-note_template')
+ expect(page).to have_selector('div#view-note_template')
+ end
+ end
+
+ context 'Have edit_issue_template permission' do
+
+ background do
+ assign_template_priv(role, add_permission: :edit_issue_templates)
+ assign_template_priv(role, add_permission: :show_issue_templates)
+ end
+
+ scenario 'Can edit the template, and view it' do
+ visit_log_user(user)
+ visit "/projects/#{project.identifier}/note_templates/#{template.id}"
+ sleep(0.2)
+ expect(page).to have_selector('div#edit-note_template')
+ expect(page).to have_no_selector('div#view-note_template')
+ end
+ end
+
+ private
+
+ def visit_log_user(user)
+ user.update_attribute(:admin, false)
+ log_user(user.login, user.login)
+ end
+end
diff --git a/spec/models/global_note_template_spec.rb b/spec/models/global_note_template_spec.rb
index b543c6a9..17bb9d4e 100644
--- a/spec/models/global_note_template_spec.rb
+++ b/spec/models/global_note_template_spec.rb
@@ -23,4 +23,13 @@
expect(GlobalNoteTemplate.sorted).to eq [note_template2, note_template3, note_template]
end
end
+
+ it 'can be deleted even though some projects bound' do
+ note_template_with_project = create(:global_note_template, tracker_id: tracker.id, position: 4, enabled: false)
+ note_template_with_project.projects << create(:project) << create(:project) << create(:project)
+
+ expect(GlobalNoteTemplate.where(id: note_template_with_project.id)).not_to be_empty
+ note_template_with_project.destroy
+ expect(GlobalNoteTemplate.where(id: note_template_with_project.id)).to be_empty
+ end
end
diff --git a/test/functional/global_issue_templates_controller_test.rb b/test/functional/global_issue_templates_controller_test.rb
index b102f55a..ddb9289e 100644
--- a/test/functional/global_issue_templates_controller_test.rb
+++ b/test/functional/global_issue_templates_controller_test.rb
@@ -59,7 +59,7 @@ def test_update_template_with_empty_title
# render :show
assert_select 'h2.global_issue_template', "#{l(:global_issue_templates)}: ##{global_issue_template.id}"
# Error message should be displayed.
- assert_select 'div#errorExplanation', { count: 1, text: /Title cannot be blank/ }, @response.body.to_s
+ assert_select 'div#errorExplanation', { count: 1, text: /Template name cannot be blank/ }, @response.body.to_s
end
def test_destroy_template
@@ -107,7 +107,7 @@ def test_create_template_fail
# render :new
assert_select 'h2', text: "#{l(:issue_templates)} / #{l(:button_add)}"
# Error message should be displayed.
- assert_select 'div#errorExplanation', { count: 1, text: /Title cannot be blank/ }, @response.body.to_s
+ assert_select 'div#errorExplanation', { count: 1, text: /Template name cannot be blank/ }, @response.body.to_s
end
def test_preview_template
diff --git a/test/functional/issue_templates_controller_test.rb b/test/functional/issue_templates_controller_test.rb
index 9bbf4416..b5efa7f5 100644
--- a/test/functional/issue_templates_controller_test.rb
+++ b/test/functional/issue_templates_controller_test.rb
@@ -110,7 +110,7 @@ def test_create_template_with_empty_title
# render :new
assert_select 'h2', text: "#{l(:issue_templates)} / #{l(:button_add)}"
# Error message should be displayed.
- assert_select 'div#errorExplanation', { count: 1, text: /Title cannot be blank/ }, @response.body.to_s
+ assert_select 'div#errorExplanation', { count: 1, text: /Template name cannot be blank/ }, @response.body.to_s
end
def test_preview_template
@@ -150,7 +150,7 @@ def test_update_template_with_empty_title
assert_select 'h2.issue_template', "#{l(:issue_templates)}: #2"
assert_select 'div#edit-issue_template'
# Error message should be displayed.
- assert_select 'div#errorExplanation', { count: 1, text: /Title cannot be blank/ }, @response.body.to_s
+ assert_select 'div#errorExplanation', { count: 1, text: /Template name cannot be blank/ }, @response.body.to_s
end
def test_delete_template_fail_if_enabled