Merge pull request #167 from arBmind/feature/redmine_6_support

Redmine 6 support

Author: arBmind

.github/data/Gemfile.local.5.1.2

@@ -1,6 +1,6 @@
 name: Specs
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 jobs:
   specs:
@@ -9,8 +9,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        redmine: [ '5.1.2', '5.1.6' ]
-        ruby: [ '2.7.7', '3.2.7' ]
+        redmine: [ '6.0.3' ]
+        ruby: [ '3.2.7', '3.3.7' ]
         database: [ 'sqlite3', 'postgresql', 'mysql2' ]
 
     services:
@@ -33,38 +33,38 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
 
-    - name: Install redmine
-      run: wget https://github.com/redmine/redmine/archive/${{ matrix.redmine }}.tar.gz -qO- | tar -C $GITHUB_WORKSPACE -xz --strip=1 --show-transformed -f -
+      - name: Install redmine
+        run: wget https://github.com/redmine/redmine/archive/${{ matrix.redmine }}.tar.gz -qO- | tar -C $GITHUB_WORKSPACE -xz --strip=1 --show-transformed -f -
 
-    - uses: actions/checkout@v4
-      with:
-        path: 'plugins/redmine_hourglass'
+      - uses: actions/checkout@v4
+        with:
+          path: 'plugins/redmine_hourglass'
 
-    - name: Create database config
-      run: |
-        cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/${{ matrix.database }}_database.yml $GITHUB_WORKSPACE/config/database.yml
-        cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/Gemfile.local.${{ matrix.redmine }} $GITHUB_WORKSPACE/Gemfile.local
+      - name: Create database config
+        run: |
+          cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/${{ matrix.database }}_database.yml $GITHUB_WORKSPACE/config/database.yml
+          cp $GITHUB_WORKSPACE/plugins/redmine_hourglass/.github/data/Gemfile.local.${{ matrix.redmine }} $GITHUB_WORKSPACE/Gemfile.local
 
-    - name: Install dependencies
-      run: |
-        bundle config set --local without 'rmagick'
-        bundle install --jobs=3 --retry=3
+      - name: Install dependencies
+        run: |
+          bundle config set --local without 'rmagick'
+          bundle install --jobs=3 --retry=3
 
-    - name: Setup database and plugin
-      run: |
-        bundle exec rake db:create
-        bundle exec rake db:migrate
-        bundle exec rake redmine:load_default_data REDMINE_LANG=en
-        bundle exec rake generate_secret_token
-        bundle exec rake redmine:plugins:migrate
-      env:
-        RAILS_ENV: test
+      - name: Setup database and plugin
+        run: |
+          bundle exec rake db:create
+          bundle exec rake db:migrate
+          bundle exec rake redmine:load_default_data REDMINE_LANG=en
+          bundle exec rake generate_secret_token
+          bundle exec rake redmine:plugins:migrate
+        env:
+          RAILS_ENV: test
 
-    - name: Run specs
-      run: bundle exec rake --trace redmine:plugins:hourglass:spec
-      env:
-        RAILS_ENV: test
+      - name: Run specs
+        run: bundle exec rake --trace redmine:plugins:hourglass:spec
+        env:
+          RAILS_ENV: test

.github/data/Gemfile.local.5.1.6

@@ -19,6 +19,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - [please add bug fixes]
 
+## [1.6.0] - TBA
+
+Upgrade to support Redmine 6. (No Redmine 5 support)
+
+### Added
+- Support for Redmine 6
+- New SVG icons
+- Custom task for asset compilation
+- Swagger documentation for time entries
+
+### Changed
+- Upgraded Gems to support Rails 7
+- Select All Toggle as Checkbox
+- Fixed Swagger API documentations for OpenAPI
+
+### Fixed
+- Submit button layout bug
+
 ## [1.3.0] - 2025-03-23
 
 Upgraded to support Redmine 5. (No Redmine 4 support)

.github/data/Gemfile.local.6.0.3

@@ -3,27 +3,27 @@ source 'https://rubygems.org'
 # asset pipeline
 gem 'uglifier'
 gem 'coffee-script', '~> 2.4.1'
-gem 'sass', '~> 3.5.1'
-gem 'sprockets', '~> 3.7.2', require: 'sprockets/railtie'
+gem 'sassc-embedded', '~> 1.80.4'
+gem 'sprockets', '~> 4.2.1'
 
 # access control
-gem 'pundit', '~> 1.1.0'
+gem 'pundit', '~> 2.5.0'
 
 # this is useful for unix based systems which don't have a js runtime installed
 # if you are on windows and this makes problems, simply remove the line
 # gem 'therubyracer', :platform => :ruby
 
 # views
-gem 'slim', '~> 3.0.8'
-gem 'js-routes', '~> 2.2.4'
-gem 'momentjs-rails', '>= 2.10.7'
+gem 'slim', '~> 5.2.1'
+gem 'js-routes', '~> 2.3.5'
+# gem 'momentjs-rails', '>= 2.10.7'
 
-gem 'rswag', '~> 2.5.1' # api docs
+gem 'rswag', '~> 2.16.0' # api docs
 gem 'rspec-core'
 gem 'rqrcode' unless dependencies.any? { |d| d.name == 'rqrcode' }
 
 group :development, :test do
-  gem 'rspec-rails', '~> 5.1.2'
+  gem 'rspec-rails', '~> 7.1.1'
   gem 'factory_bot_rails'
   gem 'zonebie'
   gem 'database_cleaner'

.github/workflows/main.yml

@@ -1,13 +1,11 @@
 toggleAllCheckBoxes = (event) ->
-  event.preventDefault()
-  $boxes = $(@).closest('table').find('input[type=checkbox]')
-  all_checked = true
-  $boxes.each -> all_checked = all_checked && $(@).prop('checked')
+  checked = $(this).prop('checked')
+  $boxes = $(@).closest('table').find('tbody input[type=checkbox]')
   $boxes.each ->
     $(@)
-    .prop('checked', !all_checked)
+    .prop('checked', checked)
     .parents('tr')
-    .toggleClass('context-menu-selection', !all_checked)
+    .toggleClass('context-menu-selection', checked)
 
 multiFormParameters = ($form) ->
   entries = {}
@@ -112,7 +110,7 @@ window.contextMenuShow = (event) ->
 $ ->
   $list = $('.hourglass-list')
   $list
-  .on 'click', '.checkbox a', toggleAllCheckBoxes
+  .on 'change', '.toggle-selection', toggleAllCheckBoxes
   .on 'ajax:success', '.js-show-inline-form', showInlineForm
   .on 'ajax:error', '.js-show-inline-form', processErrorPageResponse
   .on 'click', '.js-hide-inline-form', hideInlineForm

CHANGELOG.md

@@ -78,10 +78,11 @@ showStartDialog = (e) ->
     if $startDialogContent.length isnt 0
       e.preventDefault()
       e.stopPropagation()
+      link = e.currentTarget
       hourglass.Utils.showDialog $startDialogContent.data('content'), [
         {
           text: $startDialogContent.data('button-ok-text')
-          click: -> startDialogApplyHandler.call(@, e.target)
+          click: -> startDialogApplyHandler.call(@, link)
         }
         {
           text: $startDialogContent.data('button-cancel-text')
@@ -125,7 +126,8 @@ window.toggleOperator = (field) ->
   window.oldToggleOperator field
 
 $ ->
-  $('#content > .contextual >:nth-child(2)').after $('.js-issue-action').removeClass('hidden')
+  $('#content > .contextual >:nth-child(2)').after $('.js-issue-action');
+  $('#content > .contextual >.js-issue-action').removeClass 'hidden';
 
   $('.hourglass-quick').replaceWith $('.js-account-menu-link').removeClass('hidden')
 
@@ -142,4 +144,3 @@ $ ->
     options.data = $.param list_type: $contextMenuTarget.data('list-type')
     $contextMenuTarget.find('.context-menu-selection').each ->
       options.data += "&ids[]=#{@id}"
-

Gemfile

@@ -51,6 +51,10 @@
       white-space: nowrap;
       text-align: center;
 
+      &.create-form td {
+          padding: 0;
+      }
+
       &:hover {
         td.actions a {
           visibility: visible;
@@ -70,10 +74,17 @@
         &.actions {
           text-align: right;
           a {
-            padding: 2px 16px;
-            background-repeat: no-repeat;
-            background-position: 10px 0;
+            padding: 0 2px;
             visibility: hidden;
+
+            span.icon {
+              display: inline-block;
+              width: 16px;
+              height: 16px;
+              vertical-align: text-bottom;
+              padding: 0;
+              margin-right: 5px;
+            }
           }
         }
       }
@@ -96,6 +107,10 @@
     }
   }
 
+  input[type="submit"] {
+    height: 24px;
+  }
+
   #query_form {
     #filters-table {
       tr.filter {

app/assets/javascripts/lists.coffee

@@ -17,20 +17,11 @@
   }
 }
 
-.icon-hourglass-start {
-  background-image: image-url('icons/time_start.png');
+.context-menu-selection svg.icon-svg, #top-menu svg.icon-svg {
+  stroke: #fff;
 }
-
-.icon-hourglass-stop {
-  background-image: image-url('icons/time_stop.png');
-}
-
-.icon-hourglass-continue {
-  background-image: image-url('icons/time_continue.png');
-}
-
-.icon-hourglass-join {
-  background-image: image-url('icons/arrow_join.png');
+.context-menu-selection a:hover svg.icon-svg {
+  stroke: #c61a1a;
 }
 
 .flash {