Merge pull request #6 from gtt-project/develop

Develop into master

Author: sanak

.github/workflows/redmine.yml

@@ -0,0 +1,33 @@
+name: Test with Redmine
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+      - master
+  pull_request:
+    branches:
+      - develop
+      - main
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        redmine: [v4.0,v4.1]
+        ruby: [v2.6]
+        database: [postgresql]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Redmine plugin test
+      uses: two-pack/redmine-plugin-test-action@v2
+      with:
+        plugin_name: redmine_text_blocks
+        redmine_version: ${{ matrix.redmine }}
+        ruby_version: ${{ matrix.ruby }}
+        database: ${{ matrix.database }}

README.md

@@ -2,14 +2,17 @@
 
 This plugin adds configurable text blocks for replying to issues.
 
+## Project health
+
+![CI #develop](https://github.com/gtt-project/redmine_text_blocks/workflows/Test%20with%20Redmine/badge.svg)
 
 ## Requirements
 
- - Redmine >= 3.4.0
+- Redmine >= 3.4.0
 
 ## Installation
 
-To install Redmine text blocks plugin, download or clone this repository in your Redmine installation plugins directory! 
+To install Redmine text blocks plugin, download or clone this repository in your Redmine installation plugins directory!
 
 `git clone https://hub.georepublic.net/gtt/redmine_text_blocks.git`
 
@@ -31,7 +34,7 @@ More information on installing Redmine plugins can be found here: http://www.red
 
   - 1.0.2 Fixes localization
   - 1.0.1 Bugfix
-  
+
 
 ## Authors
 

app/controllers/text_blocks_controller.rb

@@ -4,9 +4,10 @@ class TextBlocksController < ApplicationController
   self.main_menu = false
 
   before_action :find_project_by_project_id
+  before_action :get_issue_statuses, except: [:index, :destroy]
 
-  before_action :require_admin, if: ->{ @project.nil? }
-  before_action :authorize,     if: ->{ @project.present? }
+  before_action :require_admin, if: ->{ @project.nil? } , except: :blocks_by_status
+  before_action :authorize,     if: ->{ @project.present? }, except: :blocks_by_status
 
   menu_item :settings, only: [:new, :create, :edit, :update, :destroy]
   helper_method :index_path
@@ -50,6 +51,12 @@ def destroy
     redirect_to index_path
   end
 
+  def blocks_by_status
+    @txtblocks = get_blocks_by_status(params[:status_id])
+    respond_to do |format|
+      format.json { render json: @txtblocks.to_json }
+    end
+  end
 
   private
 
@@ -62,7 +69,7 @@ def index_path
   end
 
   def text_block_params
-    params[:text_block].permit :name, :text
+    params[:text_block].permit :name, :text, :issue_status_ids => []
   end
 
   def find_text_block
@@ -79,4 +86,11 @@ def text_block_scope
     TextBlock.order(name: :asc).where(project_id: @project&.id)
   end
 
+  def get_issue_statuses
+    @issue_statuses = IssueStatus.all.sorted
+  end
+
+  def get_blocks_by_status(status_id)
+    IssueStatus.find(status_id).text_blocks.blank? ? text_block_scope : IssueStatus.find(status_id).text_blocks.where(project_id: [nil, @project&.id])
+  end
 end

app/helpers/text_blocks_helper.rb

@@ -1,14 +1,23 @@
 module TextBlocksHelper
-  def text_block_options
+  def text_block_options(issue=nil)
     tags = []
     tags << content_tag(:option, value: '') do
       t('label_select_text_block')
     end
-    tags += TextBlock.where(project_id: [nil, @project.id]).to_a.map{|tb|
-      content_tag :option, value: tb.text do
-        tb.name
-      end
-    }
+    status_textblocks = IssueStatus.find(issue.status_id).text_blocks if issue
+    if !status_textblocks.blank?
+      tags += status_textblocks.where(project_id: [nil, @project.id]).map{|tb|
+        content_tag :option, value: tb.text do
+          tb.name
+        end
+      }
+    else
+      tags += TextBlock.where(project_id: [nil, @project.id]).to_a.map{|tb|
+        content_tag :option, value: tb.text do
+          tb.name
+        end
+      }
+    end
     safe_join tags
   end
 end

app/models/text_block.rb

@@ -1,5 +1,6 @@
 class TextBlock < ActiveRecord::Base
   belongs_to :project
+  has_and_belongs_to_many :issue_statuses
 
   validates :name, presence: true
   validate :name_uniqueness

app/views/hooks/text_blocks/_view_issues_edit_notes_bottom.html.erb

@@ -1,4 +1,4 @@
 <% if User.current.allowed_to?(:view_text_blocks, @project) %>
-  <%= select_tag :text_block, text_block_options, id: 'textblock-select', style: 'display:none; border: 1px solid #e0e2e3; background: #f6f6f6; height: 24px; color: #3d454c; vertical-align: bottom; margin-left: 6px; margin-botton: 0;' %>
+  <%= select_tag :text_block, text_block_options(@issue), id: 'textblock-select', style: 'display:none; border: 1px solid #e0e2e3; background: #f6f6f6; height: 24px; color: #3d454c; vertical-align: bottom; margin-left: 6px; margin-botton: 0;' %>
   <%= javascript_include_tag 'text_blocks', plugin: 'redmine_text_blocks' %>
 <% end %>

app/views/text_blocks/_form.html.erb

@@ -3,6 +3,15 @@
 <div class="box tabular">
   <p><%= f.text_field :name, required: true, size: 25 %></p>
   <p><%= f.text_area :text, label: l(:field_text_block_text), rows: 10 %></p>
+  <p>
+    <%= content_tag :label, l(:label_issue_status_plural) %>
+    <%= f.collection_select :issue_status_ids,
+                            @issue_statuses,
+                            :id,
+                            :name,
+                            { prompt: "" },
+                            { multiple: true } %>
+  </p>
 </div>
 
 <%= wikitoolbar_for 'text_block_text' %>

app/views/text_blocks/_list.html.erb

@@ -4,6 +4,7 @@
       <tr>
         <th><%= l :label_text_block_name %></th>
         <th><%= l :label_text_block_text %></th>
+        <th><%= l :label_issue_status_plural %></th>
         <th></th>
       </tr>
     </thead>

app/views/text_blocks/_text_block.html.erb

@@ -1,5 +1,10 @@
 <tr>
   <td><%= link_to text_block.name, (text_block.project ? edit_project_text_block_path(text_block.project, text_block) : edit_text_block_path(text_block)) %></td>
   <td class="text"><div><%= textilizable text_block.text %></div></td>
+  <td class="text"><div>
+    <% text_block.issue_statuses.pluck(:name).map do |s| %>
+      <%= textilizable s %>
+    <% end %>
+  </div></td>
   <td><%= delete_link(text_block.project ? project_text_block_path(text_block.project, text_block) : text_block_path(text_block)) %>
 </tr>

assets/javascripts/text_blocks.js

@@ -13,7 +13,7 @@ var TextBlocks = {
     if(value == '') return;
 
     console.log(value);
-    var fieldId = $('#textblock-select').parent().next('div.jstEditor').find('textarea').attr('id');
+    var fieldId = $('#textblock-select').parents().next('div.jstEditor').find('textarea').attr('id');
 
     var field = document.getElementById(fieldId);
     var field_ = $(field);
@@ -32,9 +32,24 @@ var TextBlocks = {
     field.selectionEnd = caretPos + value.length
 
     $(this).val('');
-  }
+  },
 
+  reload: function(e){
+    $("#textblock-select option:gt(0)").remove();
+    $.ajax({
+      url: "/text_blocks_by_status/"+$("#issue_status_id").val()+"/"+$("#issue_project_id").val(),
+      method: "GET",
+      success: function(data){
+        data.forEach(function(tb){
+          $("#textblock-select").append($("<option></option>")
+          .attr("value", tb.text).text(tb.name));
+        });
+      }
+    });
+  }
 }
 
 $(document).ready(TextBlocks.init);
 $(document).on("change", "#textblock-select", TextBlocks.insert);
+$(document).on("change", "#issue_status_id", TextBlocks.reload);
+$(document).on("change", "#issue_project_id", TextBlocks.reload);