Merge branch 'preprod' of https://github.com/nanego/redmine_tiny_feat…

…ures into preprod
Yalaeddin · Apr 11, 2024 · b0f5d41 · b0f5d41
2 parents a4d1f7f + dc45123
commit b0f5d41
Show file tree

Hide file tree

Showing 8 changed files with 326 additions and 23 deletions.
diff --git a/.github/workflows/4_2_11.yml b/.github/workflows/4_2_11.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Install package dependencies
         run: >
-          sudo apt-get install --yes --quiet
+          sudo apt-get update && sudo apt-get install --yes --quiet
           build-essential
           cmake
           libicu-dev
@@ -81,7 +81,7 @@ jobs:
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
@@ -114,19 +114,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

diff --git a/.github/workflows/5_1_0.yml → .github/workflows/5_1_2.yml b/.github/workflows/5_1_0.yml → .github/workflows/5_1_2.yml
@@ -1,8 +1,8 @@
-name: Tests 5.1.0
+name: Tests 5.1.2
 
 env:
   PLUGIN_NAME: redmine_tiny_features
-  REDMINE_VERSION: 5.1.0
+  REDMINE_VERSION: 5.1.2
   RAILS_ENV: test
 
 on:
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Install package dependencies
         run: >
-          sudo apt-get install --yes --quiet
+          sudo apt-get update && sudo apt-get install --yes --quiet
           build-essential
           cmake
           libicu-dev
@@ -81,14 +81,15 @@ jobs:
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
 
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
+          rm -f test/integration/routing/plugins_test.rb # Fix routing tests # TODO Remove this line when https://www.redmine.org/issues/38707 is fixed
           sed -i '/rubocop/d' Gemfile
           rm -f .rubocop*
           cp plugins/redmine_base_rspec/spec/support/database-${{ matrix.db }}.yml config/database.yml
@@ -114,19 +115,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['3.1']
+        ruby: ['3.2']
         db: ['postgres']
       fail-fast: false
 
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: redmine/redmine
           ref: ${{ env.REDMINE_VERSION }}
@@ -48,7 +48,7 @@ jobs:
 
       - name: Install package dependencies
         run: >
-          sudo apt-get install --yes --quiet
+          sudo apt-get update && sudo apt-get install --yes --quiet
           build-essential
           cmake
           libicu-dev
@@ -81,7 +81,7 @@ jobs:
         run: gem install bundler -v '~> 1.0'
 
       - name: Checkout dependencies - Base RSpec plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_rspec
           path: redmine/plugins/redmine_base_rspec
@@ -114,19 +114,19 @@ jobs:
           bundle exec rails test:scm:setup:subversion
 
       - name: Checkout dependencies - Base Deface plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: jbbarth/redmine_base_deface
           path: redmine/plugins/redmine_base_deface
 
       - name: Checkout dependencies - Base StimulusJS plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: nanego/redmine_base_stimulusjs
           path: redmine/plugins/redmine_base_stimulusjs
 
       - name: Checkout plugin
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,3 @@
+group :test do
+  gem 'pdf-reader'
+end
diff --git a/README.md b/README.md
@@ -24,16 +24,17 @@ Here is a complete list of the features:
 * Add a user parameter to also **display pagination links at the top of issues results**
 * Include the 'notes' field in workflows, providing the capability to **require notes** when updating an issue
 * Issues filter: **sort group-by options alphabetically**
+* PDF exports: add **links to attached files in generated PDF**"
 
 ## Test status
 
 | Plugin branch | Redmine Version | Test Status       |
 |---------------|-----------------|-------------------|
 | master        | 4.2.11          | [![4.2.11][1]][5] |
-| master        | 5.1.0           | [![5.1.0][2]][5]  |
+| master        | 5.1.2           | [![5.1.2][2]][5]  |
 | master        | master          | [![master][3]][5] |
 
 [1]: https://github.com/nanego/redmine_tiny_features/actions/workflows/4_2_11.yml/badge.svg
-[2]: https://github.com/nanego/redmine_tiny_features/actions/workflows/5_1_0.yml/badge.svg
+[2]: https://github.com/nanego/redmine_tiny_features/actions/workflows/5_1_2.yml/badge.svg
 [3]: https://github.com/nanego/redmine_tiny_features/actions/workflows/master.yml/badge.svg
 [5]: https://github.com/nanego/redmine_tiny_features/actions
diff --git a/lib/redmine_tiny_features/hooks.rb b/lib/redmine_tiny_features/hooks.rb
@@ -42,6 +42,7 @@ def after_plugins_loaded(_context = {})
       require_relative 'user_patch'
       require_relative 'users_helper_patch'
       require_relative 'user_preference_patch'
+      require_relative 'issues_pdf_helper_patch'
     end
   end
 end