Merge branch 'develop' into 'master'

Develop

Closes #66

See merge request gtt/redmine_gtt!13

Author: dkastl

Gemfile.lock

@@ -6,7 +6,7 @@ class GttTileSourcesController < ApplicationController
   self.main_menu = false
 
   def index
-    @tile_sources = GttTileSource.order name: :asc
+    @tile_sources = GttTileSource.sorted
   end
 
   def new
@@ -31,10 +31,21 @@ def update
     ts = GttTileSource.find params[:id]
     r = RedmineGtt::Actions::UpdateTileSource.(ts, tile_source_params)
     if r.tile_source_updated?
-      redirect_to gtt_tile_sources_path
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to gtt_tile_sources_path
+        }
+        format.js { head 200 }
+      end
     else
-      @tile_source = r.tile_source
-      render 'edit'
+      respond_to do |format|
+        format.html {
+          @tile_source = r.tile_source
+          render 'edit'
+        }
+        format.js { head 422 }
+      end
     end
   end
 
@@ -50,7 +61,7 @@ def destroy
   def tile_source_params
     return {} unless params[:tile_source]
 
-    params[:tile_source].permit( :name, :type, :global,
+    params[:tile_source].permit( :name, :type, :global, :position,
                                 :default, :options_string )
   end
 end

app/controllers/gtt_tile_sources_controller.rb

@@ -34,10 +34,8 @@ def map_tag(map: nil, layers: map&.layers,
       content_tag(:div, "", data: data, id: uid, class: 'ol-map'),
       javascript_tag("
         $(document).ready(function(){
-          $('div.ol-map').each(function(idx) {
-            App.init({
-              target: this
-            });
+          App.init({
+            target: $('##{uid}')[0]
           });
         });
       ")

app/helpers/gtt_map_helper.rb

@@ -17,7 +17,7 @@ def self.from_params(params)
   end
 
   def map
-    GttMap.new json: geojson, layers: project.gtt_tile_sources
+    GttMap.new json: geojson, layers: project.gtt_tile_sources.sorted
   end
 
 end

app/models/gtt_configuration.rb

@@ -8,6 +8,9 @@ class GttTileSource < ActiveRecord::Base
   validates :type, presence: true
   validate :take_json_options
 
+  acts_as_positioned
+  scope :sorted, ->{ order :position }
+
   # globally available tile sources
   scope :global, ->{ where global: true }
 

app/models/gtt_tile_source.rb

@@ -5,6 +5,7 @@
   <td><%= checked_image tile_source.default? %></td>
   <td><%= tile_source_options tile_source %></td>
   <td class="buttons">
+    <%= reorder_handle(tile_source, url: gtt_tile_source_path(tile_source), param: 'tile_source') %>
     <%= delete_link gtt_tile_source_path(tile_source) %>
   </td>
 </tr>

app/views/gtt_tile_sources/_tile_source.html.erb

@@ -2,10 +2,10 @@
 <%= link_to l(:label_gtt_tile_source_new), new_gtt_tile_source_path, :class => 'icon icon-add' %>
 </div>
 
-<h2><%= l :label_gtt_tile_source_plural %></h2>
+<%= title l :label_gtt_tile_source_plural %>
 
 <% if @tile_sources.any? %>
-<table class="list">
+<table class="list tile_sources">
   <thead>
     <tr>
       <th><%= l :label_type %></th>
@@ -25,4 +25,6 @@
 <p class="nodata"><%= l :label_no_data %></p>
 <% end %>
 
-<% html_title l :label_gtt_tile_source_plural -%>
+<%= javascript_tag do %>
+  $(function() { $("table.tile_sources tbody").positionedItems(); });
+<% end %>

app/views/gtt_tile_sources/index.html.erb

@@ -26,6 +26,10 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
         api.geojson ""
       end
 
+      if issue.distance
+        api.distance issue.distance
+      end
+
       render_api_custom_values issue.visible_custom_field_values, api
 
       api.created_on issue.created_on

app/views/issues/index.api.rsb

@@ -3,7 +3,7 @@
 <fieldset id="location" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:field_location) %></legend>
 
-  <%= map_tag map: @project.map, geom: Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject) }), popup: { href: '/issues/[id]' } %>
+  <%= map_tag map: @project.map, geom: (Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject) }) if @issues), popup: { href: '/issues/[id]' } %>
 </fieldset>
 
 <% end %>

app/views/issues/index/_map.html.erb

@@ -1,11 +1,3 @@
-<% return '' if @issue.project.nil? %>
-<% return '' unless User.current.allowed_to?(:view_issues, @issue.project) %>
-
 <% if @project.nil? or @project.module_enabled?(:gtt) %>
-<%= content_tag(:div, "", :data => {
-    :geom => @issue.geojson,
-    :bounds => @project.geojson,
-    :layers => @project.gtt_tile_sources,
-  }, :id => 'ol-' + rand(36**8).to_s(36), :class => 'ol-map')
-%>
+  <%= map_tag map: @issue.map %>
 <% end %>