Skip to content

Commit a0c2c2e

Browse files
committed
update gtt layer and authorization
1 parent 293b22b commit a0c2c2e

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

app/controllers/gtt_configuration_controller.rb

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
class GttConfigurationController < ApplicationController
22

3+
before_action :find_optional_project_and_authorize
4+
35
accept_api_auth :default_setting_configuration
46

57
def default_setting_configuration
@@ -13,7 +15,6 @@ def build_default_setting_config
1315
default_tracker_icon = []
1416
default_status_color = []
1517
gtt_tile_source = []
16-
tracker_project_ids = []
1718

1819
Tracker.all.sort.each {|tracker|
1920
default_tracker_icon.append({
@@ -29,7 +30,7 @@ def build_default_setting_config
2930
color: Setting.plugin_redmine_gtt['status_'+status.id.to_s]
3031
})
3132
}
32-
GttTileSource.all.sort.each {|tileSource|
33+
GttTileSource.where(global: true).sort.each {|tileSource|
3334
gtt_tile_source.append({
3435
id: tileSource.id,
3536
name: tileSource.name,
@@ -55,8 +56,19 @@ def build_default_setting_config
5556
geocoderOptions: Setting.plugin_redmine_gtt['default_geocoder_options']
5657
},
5758
},
58-
gttLayer: gtt_tile_source
59+
gttLayer: gtt_tile_source,
5960
}
6061
return mapConfig
6162
end
63+
64+
private
65+
66+
def find_optional_project_and_authorize
67+
if params[:project_id]
68+
@project = Project.find params[:project_id]
69+
authorize
70+
else
71+
authorize_global
72+
end
73+
end
6274
end

0 commit comments

Comments
 (0)