Merge pull request #341 from gtt-project/next

Prepares v6.0.0 release

Author: dkastl

.github/workflows/test-postgis.yml

@@ -25,16 +25,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        redmine_version: [5.0-stable, 5.1-stable, master]
-        ruby_version: ['3.0', '3.1', '3.2']
-        db_version: [12-3.4, 16-3.4]
+        redmine_version: [5.1-stable, 6.0-stable, master]
+        ruby_version: ['3.1', '3.2', '3.3']
+        db_version: [13-3.4, 17-3.5]
         include:
           - system_test: true
-            redmine_version: 5.1-stable
-            ruby_version: '3.2'
+            redmine_version: 6.0-stable
+            ruby_version: '3.3'
         exclude:
-          - redmine_version: 5.0-stable
-            ruby_version: '3.2'
+          - redmine_version: 5.1-stable
+            ruby_version: '3.3'
           - redmine_version: master
 
     services:
@@ -106,8 +106,9 @@ jobs:
       - name: Adjust Gem environment
         run: |
           case "${{ matrix.redmine_version }}" in
-            master)
-              echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=9.0.1" >> ${GITHUB_ENV}
+            5.1-stable)
+              echo "GEM_RGEO_ACTIVERECORD_VERSION=7.0.1" >> ${GITHUB_ENV}
+              echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=7.1.1" >> ${GITHUB_ENV}
               ;;
           esac
 
@@ -142,11 +143,11 @@ jobs:
           GOOGLE_CHROME_OPTS_ARGS: "headless,disable-gpu,no-sandbox,disable-dev-shm-usage"
         working-directory: redmine
         run: |
-          bundle exec rake redmine:plugins:test:units NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
-          bundle exec rake redmine:plugins:test:functionals NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
-          bundle exec rake redmine:plugins:test:integration NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
+          bundle exec rails test plugins/redmine_gtt/test/unit
+          bundle exec rails test plugins/redmine_gtt/test/functional
+          bundle exec rails test plugins/redmine_gtt/test/integration
           if [ ${{ matrix.system_test }} = "true" ]; then
-            bundle exec rake redmine:plugins:test:system NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
+            bundle exec rails test plugins/redmine_gtt/test/system
           fi
 
       - name: Run uninstall test

Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Define gem versions with environment variables or default versions
 gem_versions = {
   pg: ENV['GEM_PG_VERSION'] || '1.5.3',
-  rgeo: ENV['GEM_RGEO_VERSION'] || '3.0.0',
-  rgeo_activerecord: ENV['GEM_RGEO_ACTIVERECORD_VERSION'] || '7.0.1',
-  activerecord_postgis_adapter: ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] || '7.1.1'
+  rgeo: ENV['GEM_RGEO_VERSION'] || '3.0.1',
+  rgeo_activerecord: ENV['GEM_RGEO_ACTIVERECORD_VERSION'] || '8.0.0',
+  activerecord_postgis_adapter: ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] || '10.0.0'
 }
 
 gem 'deface'

README.md

@@ -17,8 +17,8 @@ The Geo-Task-Tracker (GTT) plugin adds spatial capabilities to Redmine:
 Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite
 or MariaDB/MySQL!!!
 
-- Redmine >= 5.0.0
-- PostgreSQL >= 12
+- Redmine >= 5.1.0
+- PostgreSQL >= 13
 - PostGIS >= 3.0
 - NodeJS v18
 - yarn

app/models/gtt_map_layer.rb

@@ -1,7 +1,7 @@
 # Map layer model
 #
 # Configuration is stored as json
-class GttMapLayer < ActiveRecord::Base
+class GttMapLayer < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   self.inheritance_column = 'none'
 
   validates :name, presence: true

app/views/gtt_map_layers/index.html.erb

@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= link_to t('map_layer.new'), new_gtt_map_layer_path, :class => 'icon icon-add' %>
+<%= link_to (Redmine::VERSION.to_s >= '6.0.0') ? sprite_icon('add', t('map_layer.new')) : t('map_layer.new'), new_gtt_map_layer_path, :class => 'icon icon-add' %>
 </div>
 
 <%= title t('map_layer.plural') %>

app/views/issues/show.api.rsb

@@ -65,6 +65,8 @@ api.issue do
         api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
         api.notes journal.notes
         api.created_on journal.created_on
+        api.updated_on journal.updated_on
+        api.updated_by(:id => journal.updated_by.id, :name => journal.updated_by.name) unless journal.updated_by.nil?
         api.private_notes journal.private_notes
         api.array :details do
           journal.visible_details.each do |detail|

app/views/projects/index.api.rsb

@@ -5,6 +5,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.name        project.name
       api.identifier  project.identifier
       api.description project.description
+      api.homepage    project.homepage
       api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible?
       api.status      project.status
       api.is_public   project.is_public?

app/views/projects/show/_map.html.erb

@@ -1,6 +1,6 @@
 <% if @project.nil? or @project.module_enabled?(:gtt) %>
 <div class="projectmap box">
-  <h3 class="icon icon-gtt-map"><%= l(:label_project_map) %></h3>
+  <h3 class="icon icon-gtt-map"><%= (Redmine::VERSION.to_s >= '6.0.0') ? sprite_icon('gtt-map', l(:label_project_map), plugin: 'redmine_gtt') : l(:label_project_map) %></h3>
 
   <%= map_tag map: @project.map, rotation: @project.map_rotation %>
 </div>

app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb

@@ -2,3 +2,27 @@
   <textarea name="<%= l(:title_geojson_upload) %>" placeholder="<%= l(:placeholder_geojson_upload) %>" class="ui-widget ui-state-default ui-corner-all"></textarea>
   <input type="file" id="file-selector" accept=".json,.geojson">
 </div>
+
+<%= javascript_include_tag 'main', plugin: 'redmine_gtt' %>
+
+<% geocoder = { enabled: false } %>
+
+<% if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true' %>
+  <% geocoder = {
+    enabled: true,
+    provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
+    options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
+  } %>
+<% end %>
+
+<%= tag.div data: {
+  lon: Setting.plugin_redmine_gtt['default_map_center_longitude'],
+  lat: Setting.plugin_redmine_gtt['default_map_center_latitude'],
+  zoom: Setting.plugin_redmine_gtt['default_map_zoom_level'],
+  maxzoom: Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
+  vector_minzoom: Setting.plugin_redmine_gtt['vector_minzoom_level'],
+  fit_maxzoom: Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
+  geocoder: geocoder,
+  plugin_settings: Setting.plugin_redmine_gtt.select { |key, value| key.to_s.match(/^(?!default).+/) },
+  i18n: l(:gtt_js).to_json.html_safe
+}, id: 'gtt-defaults', style: 'display:none' %>

app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb

@@ -0,0 +1,7 @@
+<%= tag.meta(
+  name: 'gtt-font-custom-icons',
+  content: asset_path('plugin_assets/redmine_gtt/custom-icons.woff2')) %>
+
+<%= tag.meta(
+  name: 'gtt-font-mdi-webfont',
+  content: asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2')) %>