gb_mapfish_appserver 1.0.3 → 1.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +15 -0
  2. data/app/controllers/print_controller.rb +3 -3
  3. data/app/views/registrations/edit.html.erb +12 -2
  4. data/app/views/registrations/new.html.erb +1 -1
  5. data/app/views/users/edit.html.erb +15 -1
  6. data/lib/gb_mapfish_appserver/version.rb +1 -1
  7. metadata +93 -52
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ NDkwNmRiMzFiNzAxNzU0MDQzYTlmYzg4MTQ0YTY3Y2U1ODgwYWJiNA==
5
+ data.tar.gz: !binary |-
6
+ ODMzNjQyNzA1MzdlYTlhYWU4MWNhY2NkODI1M2I3NDM5NDliYjMxYQ==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ MmZkZjUwMDFjNWE4NWFmNGY1ZDUwNTBlMjUyYzZmMjNjNWJmNDZmYTQwOTcw
10
+ OTNlM2Y0NWU0YjJjYTVhZjllODBmNjgwODYxNzJhZmE5MGVhNzhkMmRkNWY0
11
+ OWEwMTI1YzQ5NzEyYzMwMTE1YWMwMTYxNjViYWEyMjUwODNhMDU=
12
+ data.tar.gz: !binary |-
13
+ ZWJiNmZlZGVmYjZkMDZlOGQ2NmZlODE4MjQ0MGQyYWRhNTU2MzJmNGU5OGFl
14
+ NDE1NGI3ZTZhMWJmZDIxNzRjMGZmMjIyN2NhNDA2ZjAyODFlZDMwODZlYmUx
15
+ NDA5NzVlZTA4ZGM3MDJhZGEzNGQ3ODBmY2U3NGRhYTljNDRkOWE=
data/app/controllers/print_controller.rb CHANGED
@@ -82,7 +82,7 @@ class PrintController < ApplicationController
82
82
 
83
83
  topic = Topic.find_by_name(topic_name)
84
84
  add_sld_body(topic, layer)
85
- add_filter(topic, layer)
85
+ add_filter(topic_name, layer)
86
86
 
87
87
  # For permission check in WMS controller: pass session as WMS request parameter
88
88
  #layer["customParams"]["session"] =
@@ -226,8 +226,8 @@ class PrintController < ApplicationController
226
226
  end
227
227
  end
228
228
 
229
- def add_filter(topic, layer)
230
- filters = Wms.access_filters(current_ability, current_user, topic, layer["layers"])
229
+ def add_filter(topic_name, layer)
230
+ filters = Wms.access_filters(current_ability, current_user, topic_name, layer["layers"])
231
231
  if filters.any?
232
232
  filters.each do |key, value|
233
233
  # remove existing filter
data/app/views/registrations/edit.html.erb CHANGED
@@ -1,5 +1,15 @@
1
+ <% unless resource.errors.empty? %>
2
+ <div class="alert alert-danger" role="alert">
3
+ <ul>
4
+ <% resource.errors.full_messages.each do |msg| %>
5
+ <li><%= msg %></li>
6
+ <% end %>
7
+ </ul>
8
+ </div>
9
+ <% end %>
10
+
1
11
  <div class="page-header">
2
- <h1>Login-Daten bearbeiten</h1>
12
+ <h1>Passwort ändern</h1>
3
13
  </div>
4
14
 
5
15
  <div class="panel panel-default">
@@ -7,7 +17,7 @@
7
17
  <div class="panel-body">
8
18
  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => 'form-horizontal' }) do |f| %>
9
19
  <div class="form-group">
10
- <%= f.label :login, "Benutzername", :class => 'col-sm-2 control-label' %>
20
+ <%= f.label :login, "Login", :class => 'col-sm-2 control-label' %>
11
21
  <div class="col-sm-8">
12
22
  <p class="form-control-static"><%= resource.login %></p>
13
23
  </div>
data/app/views/registrations/new.html.erb CHANGED
@@ -55,7 +55,7 @@
55
55
  <%= f.hidden_field :requested_group, :value => @group.id if @group %>
56
56
 
57
57
  <div class="form-group">
58
- <%= f.label :login, "Benutzername" %>
58
+ <%= f.label :login, "Login" %>
59
59
  <%= f.text_field :login, :class => 'form-control' %>
60
60
  </div>
61
61
 
data/app/views/users/edit.html.erb CHANGED
@@ -45,12 +45,26 @@
45
45
  <dt></dt>
46
46
  <dd>&nbsp;</dd>
47
47
  <dt></dt>
48
- <dd><%= link_to "Login-Daten bearbeiten", edit_user_registration_path(current_user), :class => 'btn btn-primary' %></dd>
48
+ <dd><%= link_to "Passwort ändern", edit_user_registration_path(current_user), :class => 'btn btn-primary' %></dd>
49
49
  <% end %>
50
50
  </dl>
51
51
  </div>
52
52
  </div>
53
53
 
54
+ <% if current_user.id == @user.id %>
55
+ <div class="panel panel-default">
56
+ <div class="panel-body">
57
+ <%= form_for @user, :html => {:class => 'form-app-infos'} do |f| %>
58
+ <div class="row">
59
+ <%= f.label "Name" %>
60
+ <%= f.text_field :name %>
61
+ </div>
62
+ <%= f.submit "Name speichern", :class => 'btn btn-primary' %>
63
+ <% end %>
64
+ </div>
65
+ </div>
66
+ <% end %>
67
+
54
68
  <% @user.groups_users.each do |groups_user| %>
55
69
  <% next if groups_user.group.nil? %>
56
70
  <% if File.exist?(File.join(Rails.root, 'app', 'views', 'registrations', groups_user.group.name)) && (@user.id == current_user.id || current_user.group_admin?(groups_user.group)) %>
data/lib/gb_mapfish_appserver/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GbMapfishAppserver
2
- VERSION = "1.0.3"
2
+ VERSION = "1.0.4"
3
3
  end
metadata CHANGED
@@ -1,170 +1,211 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gb_mapfish_appserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
5
- prerelease:
4
+ version: 1.0.4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Pirmin Kalberer
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2015-05-04 00:00:00.000000000 Z
11
+ date: 2015-07-22 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
- requirement: &7145600 !ruby/object:Gem::Requirement
17
- none: false
15
+ requirement: !ruby/object:Gem::Requirement
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
21
19
  version: 3.2.13
22
20
  type: :runtime
23
21
  prerelease: false
24
- version_requirements: *7145600
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ~>
25
+ - !ruby/object:Gem::Version
26
+ version: 3.2.13
25
27
  - !ruby/object:Gem::Dependency
26
28
  name: json
27
- requirement: &7144860 !ruby/object:Gem::Requirement
28
- none: false
29
+ requirement: !ruby/object:Gem::Requirement
29
30
  requirements:
30
31
  - - ! '>='
31
32
  - !ruby/object:Gem::Version
32
33
  version: '0'
33
34
  type: :runtime
34
35
  prerelease: false
35
- version_requirements: *7144860
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ! '>='
39
+ - !ruby/object:Gem::Version
40
+ version: '0'
36
41
  - !ruby/object:Gem::Dependency
37
42
  name: acts_as_tree
38
- requirement: &7143860 !ruby/object:Gem::Requirement
39
- none: false
43
+ requirement: !ruby/object:Gem::Requirement
40
44
  requirements:
41
- - - =
45
+ - - '='
42
46
  - !ruby/object:Gem::Version
43
47
  version: 0.2.0
44
48
  type: :runtime
45
49
  prerelease: false
46
- version_requirements: *7143860
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - '='
53
+ - !ruby/object:Gem::Version
54
+ version: 0.2.0
47
55
  - !ruby/object:Gem::Dependency
48
56
  name: devise
49
- requirement: &7142980 !ruby/object:Gem::Requirement
50
- none: false
57
+ requirement: !ruby/object:Gem::Requirement
51
58
  requirements:
52
59
  - - ~>
53
60
  - !ruby/object:Gem::Version
54
61
  version: 2.2.0
55
62
  type: :runtime
56
63
  prerelease: false
57
- version_requirements: *7142980
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: 2.2.0
58
69
  - !ruby/object:Gem::Dependency
59
70
  name: cancan
60
- requirement: &7142400 !ruby/object:Gem::Requirement
61
- none: false
71
+ requirement: !ruby/object:Gem::Requirement
62
72
  requirements:
63
- - - =
73
+ - - '='
64
74
  - !ruby/object:Gem::Version
65
75
  version: 1.6.8
66
76
  type: :runtime
67
77
  prerelease: false
68
- version_requirements: *7142400
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - '='
81
+ - !ruby/object:Gem::Version
82
+ version: 1.6.8
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: rails_admin
71
- requirement: &7141520 !ruby/object:Gem::Requirement
72
- none: false
85
+ requirement: !ruby/object:Gem::Requirement
73
86
  requirements:
74
87
  - - ~>
75
88
  - !ruby/object:Gem::Version
76
89
  version: 0.4.9
77
90
  type: :runtime
78
91
  prerelease: false
79
- version_requirements: *7141520
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: 0.4.9
80
97
  - !ruby/object:Gem::Dependency
81
98
  name: fastercsv
82
- requirement: &7140240 !ruby/object:Gem::Requirement
83
- none: false
99
+ requirement: !ruby/object:Gem::Requirement
84
100
  requirements:
85
101
  - - ! '>='
86
102
  - !ruby/object:Gem::Version
87
103
  version: '0'
88
104
  type: :runtime
89
105
  prerelease: false
90
- version_requirements: *7140240
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ! '>='
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
91
111
  - !ruby/object:Gem::Dependency
92
112
  name: sass
93
- requirement: &7154800 !ruby/object:Gem::Requirement
94
- none: false
113
+ requirement: !ruby/object:Gem::Requirement
95
114
  requirements:
96
115
  - - ~>
97
116
  - !ruby/object:Gem::Version
98
117
  version: 3.2.12
99
118
  type: :runtime
100
119
  prerelease: false
101
- version_requirements: *7154800
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ~>
123
+ - !ruby/object:Gem::Version
124
+ version: 3.2.12
102
125
  - !ruby/object:Gem::Dependency
103
126
  name: GeoRuby
104
- requirement: &7153160 !ruby/object:Gem::Requirement
105
- none: false
127
+ requirement: !ruby/object:Gem::Requirement
106
128
  requirements:
107
129
  - - ! '>='
108
130
  - !ruby/object:Gem::Version
109
131
  version: 0.1.4
110
132
  type: :runtime
111
133
  prerelease: false
112
- version_requirements: *7153160
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ! '>='
137
+ - !ruby/object:Gem::Version
138
+ version: 0.1.4
113
139
  - !ruby/object:Gem::Dependency
114
140
  name: rgeo
115
- requirement: &7152380 !ruby/object:Gem::Requirement
116
- none: false
141
+ requirement: !ruby/object:Gem::Requirement
117
142
  requirements:
118
143
  - - ~>
119
144
  - !ruby/object:Gem::Version
120
145
  version: 0.3.20
121
146
  type: :runtime
122
147
  prerelease: false
123
- version_requirements: *7152380
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ~>
151
+ - !ruby/object:Gem::Version
152
+ version: 0.3.20
124
153
  - !ruby/object:Gem::Dependency
125
154
  name: rgeo-geojson
126
- requirement: &7151220 !ruby/object:Gem::Requirement
127
- none: false
155
+ requirement: !ruby/object:Gem::Requirement
128
156
  requirements:
129
157
  - - ~>
130
158
  - !ruby/object:Gem::Version
131
159
  version: 0.2.3
132
160
  type: :runtime
133
161
  prerelease: false
134
- version_requirements: *7151220
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ~>
165
+ - !ruby/object:Gem::Version
166
+ version: 0.2.3
135
167
  - !ruby/object:Gem::Dependency
136
168
  name: hpricot
137
- requirement: &7150460 !ruby/object:Gem::Requirement
138
- none: false
169
+ requirement: !ruby/object:Gem::Requirement
139
170
  requirements:
140
171
  - - ! '>='
141
172
  - !ruby/object:Gem::Version
142
173
  version: '0'
143
174
  type: :runtime
144
175
  prerelease: false
145
- version_requirements: *7150460
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - ! '>='
179
+ - !ruby/object:Gem::Version
180
+ version: '0'
146
181
  - !ruby/object:Gem::Dependency
147
182
  name: pg
148
- requirement: &7149120 !ruby/object:Gem::Requirement
149
- none: false
183
+ requirement: !ruby/object:Gem::Requirement
150
184
  requirements:
151
185
  - - ~>
152
186
  - !ruby/object:Gem::Version
153
187
  version: 0.14.0
154
188
  type: :runtime
155
189
  prerelease: false
156
- version_requirements: *7149120
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - ~>
193
+ - !ruby/object:Gem::Version
194
+ version: 0.14.0
157
195
  - !ruby/object:Gem::Dependency
158
196
  name: activerecord-postgis-adapter
159
- requirement: &7148060 !ruby/object:Gem::Requirement
160
- none: false
197
+ requirement: !ruby/object:Gem::Requirement
161
198
  requirements:
162
- - - =
199
+ - - '='
163
200
  - !ruby/object:Gem::Version
164
201
  version: 0.4.1
165
202
  type: :runtime
166
203
  prerelease: false
167
- version_requirements: *7148060
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - '='
207
+ - !ruby/object:Gem::Version
208
+ version: 0.4.1
168
209
  description: Mapfish Appserver is a framework for web mapping applications using OGC
169
210
  standards and the Mapfish protocol.
170
211
  email:
@@ -427,27 +468,26 @@ files:
427
468
  - test/test_helper.rb
428
469
  homepage: http://mapfish-appserver.github.io/
429
470
  licenses: []
471
+ metadata: {}
430
472
  post_install_message:
431
473
  rdoc_options: []
432
474
  require_paths:
433
475
  - lib
434
476
  required_ruby_version: !ruby/object:Gem::Requirement
435
- none: false
436
477
  requirements:
437
478
  - - ! '>='
438
479
  - !ruby/object:Gem::Version
439
480
  version: '0'
440
481
  required_rubygems_version: !ruby/object:Gem::Requirement
441
- none: false
442
482
  requirements:
443
483
  - - ! '>='
444
484
  - !ruby/object:Gem::Version
445
485
  version: '0'
446
486
  requirements: []
447
487
  rubyforge_project:
448
- rubygems_version: 1.8.11
488
+ rubygems_version: 2.2.2
449
489
  signing_key:
450
- specification_version: 3
490
+ specification_version: 4
451
491
  summary: Mapfish application server.
452
492
  test_files:
453
493
  - test/dummy/README.rdoc
@@ -578,3 +618,4 @@ test_files:
578
618
  - test/gb_mapfish_appserver_test.rb
579
619
  - test/integration/navigation_test.rb
580
620
  - test/test_helper.rb
621
+ has_rdoc: