Merge remote-tracking branch 'origin/main' into ftr/custom-icons

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>

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|

test/integration/projects_api_test.rb

@@ -164,6 +164,28 @@ class ProjectsApiTest < Redmine::IntegrationTest
     assert_equal 1, projects.xpath('geojson').size, projects.to_s
   end
 
+  test 'GET /projects.xml with include=layers should return layers' do
+    ts = RedmineGtt::Actions::CreateTileSource.(type: 'ol.source.OSM', name: 'default', default: true).tile_source
+    @project.gtt_tile_sources = [ts]
+    get '/projects.xml?include=layers'
+    assert_response :success
+    xml = xml_data
+    assert projects = xml.xpath('/projects/project')
+    assert layer = projects.xpath('layers/layer').first
+    assert_equal 'ol.source.OSM', layer['type']
+  end
+
+  test 'GET /projects/1.xml with include=layers should return layers' do
+    ts = RedmineGtt::Actions::CreateTileSource.(type: 'ol.source.OSM', name: 'default', default: true).tile_source
+    @project.gtt_tile_sources = [ts]
+    get '/projects/1.xml?include=layers'
+    assert_response :success
+    xml = xml_data
+    assert project = xml.xpath('/project')
+    assert layer = project.xpath('layers/layer').first
+    assert_equal 'ol.source.OSM', layer['type']
+  end
+
   def xml_data
     Nokogiri::XML(@response.body)
   end