Merge remote-tracking branch 'origin/main' into next

Author: dkastl

app/views/projects/show.api.rsb

@@ -14,10 +14,6 @@ api.project do
     api.geojson ""
   end
 
-  if @project.gtt_tile_sources.present?
-    api.gttLayer @project.gtt_tile_sources
-  end
-
   render_api_custom_values @project.visible_custom_field_values, api
   render_api_includes(@project, api)
 

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

@@ -1,6 +1,6 @@
 <% if @project.nil? or @project.module_enabled?(:gtt) %>
 <div class="usermap box">
-  <h3><%= l(:label_project_map) %></h3>
+  <h3 class="icon icon-gtt-map"><%= l(:label_project_map) %></h3>
 
   <%= map_tag map: @project.map %>
 </div>

app/views/settings/gtt/_settings.html.erb

@@ -97,7 +97,7 @@
   <%= text_area_tag('settings[default_geocoder_options]',
       @settings['default_geocoder_options'],
       :escape => false,
-      :rows => 30,
+      :rows => 10,
       :cols => 100) %>
 </p>
 </div>

init.rb

@@ -40,7 +40,7 @@
   menu :admin_menu,
     :gtt_tile_sources,
     { controller: 'gtt_tile_sources', action: 'index' },
-    caption: :label_gtt_tile_source_plural, :html => {:class => 'icon'}
+    caption: :label_gtt_tile_source_plural, :html => {:class => 'icon icon-gtt-map'}
 end
 
 # Register MIME Types

lib/redmine_gtt/patches/projects_helper_patch.rb

@@ -8,11 +8,21 @@ module Patches
     module ProjectsHelperPatch
 
       def self.apply
+        ProjectsHelper.prepend self unless ProjectsHelper < self
         ProjectsController.class_eval do
           helper SettingsMenuItem
         end
       end
 
+      def render_api_includes(project, api)
+        super
+        api.array :layers do
+          project.gtt_tile_sources.each do |gtt_tile_source|
+            api.layer(gtt_tile_source.attributes)
+          end
+        end if include_in_api_response?('layers')
+      end
+
       module SettingsMenuItem
         def project_settings_tabs
           super.tap do |tabs|