gb_mapfish_appserver 0.9.5 → 0.9.6

data/app/controllers/print_controller.rb

@@ -296,7 +296,7 @@ class PrintController < ApplicationController
     #send_data response.body, :status => response.code, :type=>'application/x-pdf', :disposition=>'attachment', :filename=>'map.pdf'
     tempId = SecureRandom.random_number(2**31)
     temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
-    File.open(temp, 'w') {|f| f.write(response.body) }
+    File.open(temp, 'wb') {|f| f.write(response.body) }
     convert_and_send_link(temp, tempId, request.parameters["dpi"], request.parameters["outputFormat"])
   end
 
@@ -355,7 +355,7 @@ class PrintController < ApplicationController
      result
   end
 
-  #Mapfish print comaptible report delivery
+  #Mapfish print compatible report delivery
   def call_report(request)
       result = create_report(request)
       if result.nil?
@@ -366,7 +366,7 @@ class PrintController < ApplicationController
       if result.kind_of? Net::HTTPSuccess
         temp_id = SecureRandom.random_number(2**31)
         temp = TMP_PREFIX + temp_id.to_s + TMP_SUFFIX
-        File.open(temp, 'w') {|f| f.write(result.body) }
+        File.open(temp, 'wb') {|f| f.write(result.body) }
 
         render :json=>{ 'getURL' => url_for(:action=> 'show', :id=> temp_id) + ".pdf" }
       else

data/app/models/search_model.rb

@@ -1,6 +1,7 @@
 class SearchModel < GeoModel
 
   LOCATE_MAX_COUNT = 50
+  SEARCH_MAX_COUNT = 50
 
   self.abstract_class = true
 

data/app/models/topic.rb

@@ -44,7 +44,8 @@ class Topic < ActiveRecord::Base
         unless category.nil?
           category_topics = category.topics.accessible_by(current_ability)
           category_topics = category_topics.includes(:organisation).includes(:bg_topic).includes(:overlay_topics) # optimize query performance
-          category_topics.select('topics.*,categories_topics.sort AS categories_topics_sort')
+          category_topics = category_topics.select('topics.*,categories_topics.sort AS categories_topics_sort')
+
           topics += category_topics.collect do |topic|
             subtopics = category_topics.select{|t| t.parent_id == topic.id}.collect do |subtopic|
               {

data/app/views/apps/_request_state.html.erb

@@ -1,10 +1,19 @@
     <script type="text/javascript">
         var requestState = {
             <% if user_signed_in? %>
-            user: '<%= current_user.login %>',
+            user: {
+                login: '<%= current_user.login %>',
+                email: '<%= current_user.email %>'
+            },
+            roles: <%= raw @current_roles.to_json %>,
             <% end %>
             mainRequestedTopic: '<%= @topic_name %>',
+            <% if @back_topic_name.nil? %>
             backRequestedTopic: null,
+            <% else %>
+            backRequestedTopic: '<%= @back_topic_name %>',
+            <% end %>
+            overRequestedTopic: <%=raw @over_topic_name %>,
             mainDefaultTopic: '<%= @main_default_topic %>',
             backDefaultTopic: null,
             offlayers: <%= raw @offlayers.to_json %>,

data/config/routes.rb

@@ -1,7 +1,5 @@
 Rails.application.routes.draw do
 
-  mount RailsAdmin::Engine => '/gbadmin', :as => 'rails_admin'
-
   devise_for :users,
     :path => "session", :controllers => {:registrations => "registrations"},
     :sign_out_via => [ :get, :delete ]
@@ -14,6 +12,8 @@ Rails.application.routes.draw do
     match '/session/confirm' => "registrations#confirm", :as => :user_confirm
   end
 
+  mount RailsAdmin::Engine => '/gbadmin', :as => 'rails_admin'
+
   resources :token_authentications, :only => [:create, :destroy]
 
   resources :groups_users do

data/gb_mapfish_appserver.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency "devise", "~> 2.2.0"
   s.add_dependency "cancan", "1.6.8" # 1.6.9 breaks aliasing to :show (https://github.com/ryanb/cancan/pull/660#issuecomment-13257667)
 
-  s.add_dependency "rails_admin", "~> 0.4.0"
+  s.add_dependency "rails_admin", "~> 0.4.9"
+
   s.add_dependency "fastercsv" # required for rails_admin and Ruby <= 1.8
   s.add_dependency "sass", "~> 3.2.12" # rails_admin 0.0.5 does not work with sass >=3.3
 

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/lib/tasks/mapfile.rake

@@ -51,6 +51,7 @@ namespace :mapfile do
       topic.main_layer = true if topic.main_layer.nil?
       topic.save!
 
+      topic.topics_layers.destroy_all
       Layer.unused.destroy_all
       SublayerGroup.unused.destroy_all
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &13079460 !ruby/object:Gem::Requirement
+  requirement: &4201140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *13079460
+  version_requirements: *4201140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13091140 !ruby/object:Gem::Requirement
+  requirement: &4200640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13091140
+  version_requirements: *4200640
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &13088220 !ruby/object:Gem::Requirement
+  requirement: &4200020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13088220
+  version_requirements: *4200020
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13102320 !ruby/object:Gem::Requirement
+  requirement: &4199360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *13102320
+  version_requirements: *4199360
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &13099000 !ruby/object:Gem::Requirement
+  requirement: &4198860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,21 +65,21 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *13099000
+  version_requirements: *4198860
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &13095780 !ruby/object:Gem::Requirement
+  requirement: &4198360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.9
   type: :runtime
   prerelease: false
-  version_requirements: *13095780
+  version_requirements: *4198360
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &13109120 !ruby/object:Gem::Requirement
+  requirement: &4197860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13109120
+  version_requirements: *4197860
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &13106760 !ruby/object:Gem::Requirement
+  requirement: &4197280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *13106760
+  version_requirements: *4197280
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &12738520 !ruby/object:Gem::Requirement
+  requirement: &4196660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *12738520
+  version_requirements: *4196660
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &12816320 !ruby/object:Gem::Requirement
+  requirement: &4196180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *12816320
+  version_requirements: *4196180
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &12810900 !ruby/object:Gem::Requirement
+  requirement: &4211880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *12810900
+  version_requirements: *4211880
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &12829520 !ruby/object:Gem::Requirement
+  requirement: &4211280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12829520
+  version_requirements: *4211280
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &12836620 !ruby/object:Gem::Requirement
+  requirement: &4210640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *12836620
+  version_requirements: *4210640
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &12860020 !ruby/object:Gem::Requirement
+  requirement: &4210120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *12860020
+  version_requirements: *4210120
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email: