Merge branch 'main' into next

Signed-off-by: Daniel Kastl <[email protected]>

Author: dkastl

.github/workflows/redmine.yml

@@ -0,0 +1,138 @@
+name: Test with PostGIS
+
+env:
+  PLUGIN_NAME: ${{ github.event.repository.name }}
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+jobs:
+  test:
+    name: redmine:${{ matrix.redmine_version }} ruby:${{ matrix.ruby_version }} postgis:${{ matrix.db_version }}
+    runs-on: ubuntu-22.04
+
+    container:
+      image: ruby:${{ matrix.ruby_version }}-bullseye
+
+    strategy:
+      fail-fast: false
+      matrix:
+        redmine_version: [4.2-stable, 5.0-stable, master]
+        ruby_version: [2.7, 3.0, 3.1]
+        db_version: [11-2.5, 14-3.2]
+        exclude:
+          - redmine_version: 4.2-stable
+            ruby_version: 3.0
+          - redmine_version: 4.2-stable
+            ruby_version: 3.1
+
+    services:
+      postgres:
+        image: postgis/postgis:${{ matrix.db_version }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    steps:
+      - name: Checkout Redmine
+        uses: actions/checkout@v2
+        with:
+          repository: redmine/redmine
+          ref: ${{ matrix.redmine_version }}
+          path: redmine
+
+      - name: Checkout Plugin
+        uses: actions/checkout@v2
+        with:
+          path: redmine/plugins/${{ env.PLUGIN_NAME }}
+
+      - name: Update package archives
+        run: apt-get update --yes --quiet
+
+      - name: Install package dependencies
+        run: >
+          apt-get install --yes --quiet
+          postgresql-client
+          gcc libpq-dev make patch libgeos-dev curl
+
+      - name: Install Node/Yarn packages
+        run: |
+          curl -sL https://deb.nodesource.com/setup_16.x | bash -
+          curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+          echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+          apt-get update --yes --quiet
+          apt-get install --yes --quiet --no-install-recommends nodejs yarn
+
+      - name: Prepare Plugin
+        working-directory: redmine/plugins/redmine_gtt
+        run: |
+          yarn
+          npx webpack
+
+      - name: Prepare Redmine source
+        working-directory: redmine
+        run: |
+          cat <<EOF > config/database.yml
+            test:
+              adapter: postgis
+              database: redmine
+              host: postgres
+              username: postgres
+              password: postgres
+              encoding: utf8
+          EOF
+
+      - name: Adjust Gem environment
+        run: |
+          case "${{ matrix.redmine_version }}" in
+            4.2-stable)
+              echo "GEM_RGEO_ACTIVERECORD_VERSION=6.2.2" >> ${GITHUB_ENV}
+              echo "GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=5.2.3" >> ${GITHUB_ENV}
+              ;;
+          esac
+
+      - name: Install Ruby dependencies
+        working-directory: redmine
+        run: |
+          bundle config set --local without 'development'
+          bundle install --jobs=4 --retry=3
+
+      - name: Run Redmine rake tasks
+        env:
+          RAILS_ENV: test
+        working-directory: redmine
+        run: |
+          bundle exec rake generate_secret_token
+          bundle exec rake db:create db:migrate redmine:plugins:migrate
+
+      - name: Zeitwerk check
+        env:
+          RAILS_ENV: test
+        working-directory: redmine
+        run: |
+          if grep -q zeitwerk config/application.rb ; then
+            bundle exec rake zeitwerk:check
+          fi
+        shell: bash
+
+      - name: Run tests
+        env:
+          RAILS_ENV: test
+        working-directory: redmine
+        run: bundle exec rake redmine:plugins:test NAME=${{ env.PLUGIN_NAME }} RUBYOPT="-W0"
+
+      - name: Run uninstall test
+        env:
+          RAILS_ENV: test
+        working-directory: redmine
+        run: bundle exec rake redmine:plugins:migrate NAME=${{ env.PLUGIN_NAME }} VERSION=0

.github/workflows/test-postgis.yml

@@ -1,7 +1,6 @@
 # Redmine Geo-Task-Tracker (GTT) Plugin
 
-![CI #develop](https://github.com/gtt-project/redmine_gtt/workflows/Test%20with%20Redmine/badge.svg)
-[![Translation status](https://weblate.osgeo.org/widgets/gtt-project/-/redmine_gtt/svg-badge.svg)](https://weblate.osgeo.org/engage/gtt-project/)
+[![CI](https://github.com/gtt-project/redmine_gtt/workflows/Test%20with%20PostGIS/badge.svg)](https://github.com/gtt-project/redmine_gtt/actions?query=workflow%3A%22Test%20with%20PostGIS%22+branch%3Amain)
 
 The Geo-Task-Tracker (GTT) plugin adds spatial capabilities to Redmine:
 
@@ -27,14 +26,14 @@ Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite
 
 Create a PostGIS-enabled database:
 
-```
+```sh
 createdb -U postgres -O redmine redmine
 psql -U postgres -d redmine -c "CREATE EXTENSION postgis;"
 ```
 
 To install Redmine GTT plugin, download or clone this repository in your Redmine installation plugins directory!
 
-```
+```sh
 cd path/to/plugin/directory
 git clone https://github.com/gtt-project/redmine_gtt.git
 cd redmine_gtt
@@ -44,7 +43,7 @@ npx webpack
 
 Then run
 
-```
+```sh
 export GEM_PG_VERSION=your-pg-version # skip this line if redmine use pg 1.2.2.
 export GEM_RGEO_ACTIVERECORD_VERSION=your-rgeo-activerecord-version # skip this line if using rgeo-activerecord 6.2.2.
 export GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=your-activerecord-postgis-adapter-version # skip this line if using activerecord-postgis-adapter 5.2.3.
@@ -56,7 +55,7 @@ Before restarting Redmine, you need to set `postgis` adapter instead of `postgre
 
 After restarting Redmine, you should be able to see the Redmine GTT plugin in the Plugins page.
 
-More information on installing (and uninstalling) Redmine plugins can be found here: http://www.redmine.org/wiki/redmine/Plugins
+More information on installing (and uninstalling) Redmine plugins can be found in the [Redmine Plugin docs](http://www.redmine.org/wiki/redmine/Plugins).
 
 ## How to use
 
@@ -68,6 +67,10 @@ More information on installing (and uninstalling) Redmine plugins can be found h
 
 For more information with screenshots see the [Getting Started](doc/getting-started.md) guide.
 
+## Plugin API
+
+For more information see the [Redmine GTT API](doc/api.md) docs.
+
 ## Contributing and Support
 
 The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)! Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
@@ -82,15 +85,15 @@ Help us to translate GTT Project using [OSGeo Weblate](https://weblate.osgeo.org
 
 You can debug frontend by running the following command on another console:
 
-```
+```sh
 npx webpack --watch --mode=development
 ```
 
 ### How to run test
 
 You can run the plugin test on rails test environment by the following command:
 
-```
+```sh
 bundle exec rake db:create
 RAILS_ENV=test bundle exec rake db:migrate
 RAILS_ENV=test bundle exec rake redmine:plugins:migrate
@@ -99,8 +102,7 @@ RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
 
 ## Version History
 
-- **4.0.0**: Support Redmine >= 5.0 and drop Redmine <= 4.1 support
-- See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with release notes.
+See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with release notes.
 
 ## Authors
 
@@ -109,6 +111,8 @@ RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
 - [Thibault Mutabazi](https://github.com/eyewritecode)
 - [Ko Nagase](https://github.com/sanak)
 - [Taro Matsuzawa](https://github.com/smellman)
+- [Mario Basa](https://github.com/mbasa)
+- [Nisai Nob](https://github.com/nobnisai)
 - ... [and others](https://github.com/gtt-project/redmine_gtt/graphs/contributors)
 
 ## LICENSE

README.md

@@ -0,0 +1,74 @@
+class GttConfigurationController < ApplicationController
+
+    before_action :find_optional_project_and_authorize
+
+    accept_api_auth :default_setting_configuration
+
+    def default_setting_configuration
+        gtt_map_config = build_default_setting_config
+        respond_to do |format|
+          format.api { render json: build_default_setting_config}
+        end
+    end
+
+    def build_default_setting_config
+        default_tracker_icon = []
+        default_status_color = []
+        gtt_tile_source = []
+
+        Tracker.all.sort.each {|tracker|
+            default_tracker_icon.append({
+                trackerID: tracker.id,
+                trackerName: tracker.name,
+                icon: Setting.plugin_redmine_gtt['tracker_'+tracker.id.to_s]
+            })
+        }
+        IssueStatus.all.sort.each {|status|
+            default_status_color.append({
+                statusID: status.id,
+                statusName: status.name,
+                color: Setting.plugin_redmine_gtt['status_'+status.id.to_s]
+            })
+        }
+        GttTileSource.where(global: true).sort.each {|tileSource|
+            gtt_tile_source.append({
+                id: tileSource.id,
+                name: tileSource.name,
+                type: tileSource.type,
+                options: tileSource.options
+            })
+        }
+
+        mapConfig = {
+            gttDefaultSetting: {
+                defaultTrackerIcon: default_tracker_icon,
+                defaultStatusColor: default_status_color,
+                defaultMapSetting: {
+                    centerLng: Setting.plugin_redmine_gtt['default_map_center_longitude'],
+                    centerLat: Setting.plugin_redmine_gtt['default_map_center_latitude']
+                },
+                geometrySetting: {
+                    geometryTypes: Setting.plugin_redmine_gtt['editable_geometry_types_on_issue_map'],
+                    GeoJsonUpload: (Setting.plugin_redmine_gtt['enable_geojson_upload_on_issue_map'] == 'true'),
+                },
+                geocoderSetting: {
+                    enableGeocodingOnMap: (Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true'),
+                    geocoderOptions: Setting.plugin_redmine_gtt['default_geocoder_options']
+                },
+            },
+            gttLayer: gtt_tile_source,
+        }
+        return mapConfig
+    end
+
+    private
+
+    def find_optional_project_and_authorize
+        if params[:project_id]
+            @project = Project.find params[:project_id]
+            authorize
+        else
+            authorize_global
+        end
+    end
+end

app/controllers/gtt_configuration_controller.rb

@@ -16,7 +16,7 @@ def new
   def create
     r = RedmineGtt::Actions::CreateTileSource.(tile_source_params)
     if r.tile_source_created?
-      redirect_to gtt_tile_sources_path
+      redirect_to(params[:continue] ? new_gtt_tile_source_path : gtt_tile_sources_path)
     else
       @tile_source = r.tile_source
       render 'new'
@@ -61,7 +61,7 @@ def destroy
   def tile_source_params
     return {} unless params[:tile_source]
 
-    params[:tile_source].permit( :name, :type, :global, :position,
+    params[:tile_source].permit( :name, :type, :baselayer, :global, :position,
                                 :default, :options_string )
   end
 end