Merge pull request #259 from akiko-pusu/develop

Release v0.3.4

.circleci/config.yml

@@ -11,14 +11,14 @@ general:
 jobs:
   build:
     docker:
-      # specify the version you desire here (ruby 2.4.x)
-      - image: circleci/ruby:2.5-browsers-legacy
+      # specify the version you desire here (ruby 2.6.x)
+      - image: circleci/ruby:2.6-browsers-legacy
     steps:
       - checkout
   test:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.5-browsers-legacy
+      - image: circleci/ruby:2.6-browsers-legacy
         environment:
           RAILS_ENV: test
           DB_HOST: 127.0.0.1
@@ -37,6 +37,7 @@ jobs:
           name: ready for redmine
           command: |
             REDMINE_BRANCH=master sh script/circleci-setup.sh
+      - run: perl -pi -e "s/gem \"capybara\".*$/gem \"capybara\"/g" Gemfile
       - run: bundle install --path vendor/bundle --without postgresql rmagick && bundle update
       - run: bundle exec rails g rspec:install
       - run: bundle exec rake db:create RAILS_ENV=test
@@ -47,7 +48,20 @@ jobs:
             bundle exec rake ${CIRCLE_PROJECT_REPONAME}:test RAILS_ENV=test
       - run:
           command: |
-            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/
+            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/models/
+      - run:
+          command: |
+            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/helpers/
+      - run:
+          command: |
+            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/controllers/
+      - run:
+          command: |
+            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/requests/
+      - run:
+          command: |
+            bundle exec rspec -I plugins/redmine_issue_templates/spec --format documentation plugins/redmine_issue_templates/spec/features/
+
       - run:
           command: |
             bundle exec rake redmine:plugins:migrate NAME=${CIRCLE_PROJECT_REPONAME} \

.gitattributes

@@ -7,3 +7,4 @@ Gemfile.local export-ignore
 .circleci/ export-ignore
 docker-compose.yml export-ignore
 Dockerfile export-ignore
+_config.yml export-ignore

.rubocop.yml

@@ -1,3 +1,3 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3

README.md

@@ -71,9 +71,18 @@ If you have any requests, bug reports, please use GitHub issues. <https://github
 
 ## Changelog
 
+### 0.3.4
+
+This is bugfix release against v0.3.3.
+
+* Add navigation link between issue template and note template.
+* Refactor: Change to use let / const instead of var.
+* Update test environment, especially E2E. (Follow up Redmine4.1)
+* Bugfix #256 / Related to checklists.
+
 ### 0.3.3
 
-This is bugfix release against v0.3.2. 
+This is bugfix release against v0.3.2.
 Updating to 0.3.3 is highly recommended!
 
 * Revert and Bugfix #230
@@ -204,7 +213,7 @@ Please see wercker.yml for more details.
 % cp plugins/redmine_issue_templates/Gemfile.local plugins/redmine_issue_templates/Gemfile
 % bundle install --with test
 % export RAILS_ENV=test
-% bundle exec ruby -I"lib:test" -I plugins/redmine_issue_templates/test plugins/redmine_issue_templates/test/functional/issue_templates_controller_test.rb 
+% bundle exec ruby -I"lib:test" -I plugins/redmine_issue_templates/test plugins/redmine_issue_templates/test/functional/issue_templates_controller_test.rb
 ```
 
 or

app/controllers/concerns/issue_templates_common.rb

@@ -23,7 +23,7 @@ def apply_all_projects?
     end
 
     def checklists
-      template_params[:checklists].blank? ? {} : template_params[:checklists]
+      template_params[:checklists].blank? ? [] : template_params[:checklists]
     end
 
     def checklist_enabled?
@@ -35,7 +35,7 @@ def checklist_enabled?
     def valid_params
       # convert attribute name and data for checklist plugin supporting
       attributes = template_params.except(:checklists)
-      attributes[:checklist_json] = checklists.to_json if checklist_enabled? && checklists.present?
+      attributes[:checklist_json] = checklists.to_json if checklist_enabled?
       attributes
     end
   end

app/views/common/_template_links.html.erb

@@ -0,0 +1,23 @@
+<div style="display: flex; float: right; padding-top: 20px;
+                    position: relative; bottom: 6px; right: 0;">
+    <div class="template_link_area">
+      <label><%= l(:issue_template) %>: </label>
+      <%= link_to(l(:label_list_templates),
+                { controller: 'issue_templates',
+                  action: 'index',
+                  project_id: @project}, class: 'template') %>   |
+      <%= link_to_if_authorized(l(:label_new_templates),
+                              { controller: 'issue_templates', action: 'new', project_id: @project },
+                              class: 'icon icon-add') %>
+    </div>
+    <div class="template_link_area">
+      <label><%= l(:note_template) %>: </label>
+      <%= link_to(l(:label_list_templates),
+                { controller: 'note_templates',
+                  action: 'index',
+                  project_id: @project}, class: 'template') %>   |
+      <%= link_to_if_authorized(l(:label_new_templates),
+                              { controller: 'note_templates', action: 'new', project_id: @project },
+                              class: 'icon icon-add') %>
+    </div>
+</div>