device_tracker 0.3.2 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/device_tracker.gemspec +13 -13
- data/lib/device_tracker/controllers/application_controller.rb +1 -1
- data/lib/device_tracker/controllers/transactions_controller.rb +1 -1
- data/lib/device_tracker/controllers/users_controller.rb +3 -0
- data/lib/device_tracker/db/migrate/20161103135510_add_is_developer_to_users.rb +8 -0
- data/lib/device_tracker/version.rb +1 -1
- data/lib/device_tracker/views/_user_form.erb +6 -0
- data/lib/device_tracker/views/devices/show.erb +3 -1
- data/lib/device_tracker/views/index.erb +2 -2
- data/lib/device_tracker/views/users/manage.erb +1 -0
- metadata +46 -27
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: df251b07b969772c80c3c575cdc5a1d2c461560a
|
4
|
+
data.tar.gz: a5f533d66c0bdc34cd38154a331ac522515b4b81
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 30bfc407ef2be9b1e8e1e97636d0f5ab9b026027f2c836fe747c064be3ac39990a98aac66fad94e1d25452f6a26e06956b9df37a0a630e88ae0df591aefe2a1f
|
7
|
+
data.tar.gz: f2c455436eeb109353f433ce635b13ecfda0ef6d67d1ab6a14a6f36cdf28589bb3fbdadd8def86b71a39febcd8c41c11a0c58ba1e7fb9c81fdac0caa1bfae40d
|
data/device_tracker.gemspec
CHANGED
@@ -45,19 +45,19 @@ Gem::Specification.new do |spec|
|
|
45
45
|
spec.add_development_dependency 'database_cleaner'
|
46
46
|
spec.add_development_dependency 'factory_girl'
|
47
47
|
|
48
|
-
spec.add_dependency 'sinatra', '~> 1.4'
|
49
|
-
spec.add_dependency 'activerecord', '~>
|
50
|
-
spec.add_dependency 'sinatra-activerecord', '~> 2.0'
|
51
|
-
spec.add_dependency 'bcrypt', '~> 3.1.
|
52
|
-
spec.add_dependency 'json', '~>
|
53
|
-
spec.add_dependency 'sinatra-contrib', '~> 1.4'
|
54
|
-
spec.add_dependency 'sinatra-partial', '~> 0.
|
55
|
-
spec.add_dependency 'sinatra-flash', '~> 0.3'
|
56
|
-
spec.add_dependency 'thin', '~> 1.
|
57
|
-
spec.add_dependency 'rake', '~>
|
58
|
-
spec.add_dependency 'sqlite3', '~> 1.3'
|
48
|
+
spec.add_dependency 'sinatra', '~> 1.4.7'
|
49
|
+
spec.add_dependency 'activerecord', '~> 5.0', '>= 5.0.0.1'
|
50
|
+
spec.add_dependency 'sinatra-activerecord', '~> 2.0', '>= 2.0.11'
|
51
|
+
spec.add_dependency 'bcrypt', '~> 3.1.11'
|
52
|
+
spec.add_dependency 'json', '~> 2.0', '>= 2.0.2'
|
53
|
+
spec.add_dependency 'sinatra-contrib', '~> 1.4.7'
|
54
|
+
spec.add_dependency 'sinatra-partial', '~> 1.0.0'
|
55
|
+
spec.add_dependency 'sinatra-flash', '~> 0.3.0'
|
56
|
+
spec.add_dependency 'thin', '~> 1.7.0'
|
57
|
+
spec.add_dependency 'rake', '~> 11.3.0'
|
58
|
+
spec.add_dependency 'sqlite3', '~> 1.3.12'
|
59
59
|
spec.add_dependency 'pony', '~> 1.11'
|
60
|
-
spec.add_dependency 'mysql2', '~> 0.
|
61
|
-
spec.add_dependency 'json-schema', '~> 2.
|
60
|
+
spec.add_dependency 'mysql2', '~> 0.4.5'
|
61
|
+
spec.add_dependency 'json-schema', '~> 2.7.0'
|
62
62
|
spec.add_dependency 'faker'
|
63
63
|
end
|
@@ -4,7 +4,7 @@ module DeviceTracker
|
|
4
4
|
# :nodoc:
|
5
5
|
class TransactionsController < ApplicationController
|
6
6
|
get '/' do
|
7
|
-
@transactions = Transaction.limit(
|
7
|
+
@transactions = Transaction.limit(200).order(created_at: :desc).all
|
8
8
|
|
9
9
|
erb :"transactions/index"
|
10
10
|
end
|
@@ -55,6 +55,9 @@ module DeviceTracker
|
|
55
55
|
params[:user][:is_admin] == 'on')
|
56
56
|
user.is_verified = (!params[:user][:is_verified].nil? &&
|
57
57
|
params[:user][:is_verified] == 'on')
|
58
|
+
|
59
|
+
user.is_developer = (!params[:user][:is_developer].nil? &&
|
60
|
+
params[:user][:is_developer] == 'on')
|
58
61
|
end
|
59
62
|
|
60
63
|
unless original_params[:password].empty?
|
@@ -27,4 +27,10 @@
|
|
27
27
|
<input type="checkbox" id="is_verified" name="user[is_verified]" <%= @user.is_verified == true ? "checked='checked'" : "" %>>
|
28
28
|
<label for="is_verified">Verified</label>
|
29
29
|
</div>
|
30
|
+
<div class="form-group">
|
31
|
+
<p class="help-block">Users that are classed as <code>Developers</code> are able to checkout devices
|
32
|
+
for an indefinate time period.</p>
|
33
|
+
<input type="checkbox" id="is_developer" name="user[is_developer]" <%= @user.is_developer == true ? "checked='checked'" : "" %>>
|
34
|
+
<label for="is_developer">Developer</label>
|
35
|
+
</div>
|
30
36
|
<% end %>
|
@@ -107,7 +107,9 @@
|
|
107
107
|
<% unless @device.available %>
|
108
108
|
<div class="panel panel-default">
|
109
109
|
<!-- Default panel contents -->
|
110
|
-
<div class="panel-heading">Current User
|
110
|
+
<div class="panel-heading">Current User
|
111
|
+
<% if @device.user.is_developer %>
|
112
|
+
<span class="pull-right label label-info">Developer</span><% end %></div>
|
111
113
|
<!-- List group -->
|
112
114
|
<ul class="list-group">
|
113
115
|
<li class="list-group-item">
|
@@ -18,9 +18,9 @@
|
|
18
18
|
</thead>
|
19
19
|
<tbody>
|
20
20
|
<% @devices.each do |device| %>
|
21
|
-
<tr class="clickable-row <%= device.passed_use_by_date? ? "danger" : "" %>" data-url="/devices/<%= device.id %>">
|
21
|
+
<tr class="clickable-row <%= device.passed_use_by_date? && !device.user.is_developer ? "danger" : "" %>" data-url="/devices/<%= device.id %>">
|
22
22
|
<td><%= device.full_name %></td>
|
23
|
-
<td><%= device.user.name %></td>
|
23
|
+
<td><%= device.user.name %> <% if device.user.is_developer %><span class="label label-info">Developer</span><% end %></td>
|
24
24
|
<td><%= device.checked_out_since_formatted %></td>
|
25
25
|
</tr>
|
26
26
|
<% end %>
|
@@ -17,6 +17,7 @@
|
|
17
17
|
<b>Administrator: </b><%= user.is_admin? == true ? "Yes" : "No"%><br>
|
18
18
|
<b>Device count: </b><%= user.devices.size %><br>
|
19
19
|
<b>Account Verified: </b><%= user.is_verified? == true ? "Yes" : "No" %><br>
|
20
|
+
<b>Developer: <%= user.is_developer? == true ? "Yes" : "No"%></b>
|
20
21
|
</td>
|
21
22
|
<td width="10%">
|
22
23
|
<a href="/users/<%= user.id %>/edit" class="btn btn-warning btn-full-width btn-xs padding-bottom">Edit</a>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: device_tracker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.4.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- James Ruston
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: exe
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2016-11-04 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|
@@ -143,28 +143,34 @@ dependencies:
|
|
143
143
|
requirements:
|
144
144
|
- - "~>"
|
145
145
|
- !ruby/object:Gem::Version
|
146
|
-
version:
|
146
|
+
version: 1.4.7
|
147
147
|
type: :runtime
|
148
148
|
prerelease: false
|
149
149
|
version_requirements: !ruby/object:Gem::Requirement
|
150
150
|
requirements:
|
151
151
|
- - "~>"
|
152
152
|
- !ruby/object:Gem::Version
|
153
|
-
version:
|
153
|
+
version: 1.4.7
|
154
154
|
- !ruby/object:Gem::Dependency
|
155
155
|
name: activerecord
|
156
156
|
requirement: !ruby/object:Gem::Requirement
|
157
157
|
requirements:
|
158
158
|
- - "~>"
|
159
159
|
- !ruby/object:Gem::Version
|
160
|
-
version: '
|
160
|
+
version: '5.0'
|
161
|
+
- - ">="
|
162
|
+
- !ruby/object:Gem::Version
|
163
|
+
version: 5.0.0.1
|
161
164
|
type: :runtime
|
162
165
|
prerelease: false
|
163
166
|
version_requirements: !ruby/object:Gem::Requirement
|
164
167
|
requirements:
|
165
168
|
- - "~>"
|
166
169
|
- !ruby/object:Gem::Version
|
167
|
-
version: '
|
170
|
+
version: '5.0'
|
171
|
+
- - ">="
|
172
|
+
- !ruby/object:Gem::Version
|
173
|
+
version: 5.0.0.1
|
168
174
|
- !ruby/object:Gem::Dependency
|
169
175
|
name: sinatra-activerecord
|
170
176
|
requirement: !ruby/object:Gem::Requirement
|
@@ -172,6 +178,9 @@ dependencies:
|
|
172
178
|
- - "~>"
|
173
179
|
- !ruby/object:Gem::Version
|
174
180
|
version: '2.0'
|
181
|
+
- - ">="
|
182
|
+
- !ruby/object:Gem::Version
|
183
|
+
version: 2.0.11
|
175
184
|
type: :runtime
|
176
185
|
prerelease: false
|
177
186
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -179,118 +188,127 @@ dependencies:
|
|
179
188
|
- - "~>"
|
180
189
|
- !ruby/object:Gem::Version
|
181
190
|
version: '2.0'
|
191
|
+
- - ">="
|
192
|
+
- !ruby/object:Gem::Version
|
193
|
+
version: 2.0.11
|
182
194
|
- !ruby/object:Gem::Dependency
|
183
195
|
name: bcrypt
|
184
196
|
requirement: !ruby/object:Gem::Requirement
|
185
197
|
requirements:
|
186
198
|
- - "~>"
|
187
199
|
- !ruby/object:Gem::Version
|
188
|
-
version: 3.1.
|
200
|
+
version: 3.1.11
|
189
201
|
type: :runtime
|
190
202
|
prerelease: false
|
191
203
|
version_requirements: !ruby/object:Gem::Requirement
|
192
204
|
requirements:
|
193
205
|
- - "~>"
|
194
206
|
- !ruby/object:Gem::Version
|
195
|
-
version: 3.1.
|
207
|
+
version: 3.1.11
|
196
208
|
- !ruby/object:Gem::Dependency
|
197
209
|
name: json
|
198
210
|
requirement: !ruby/object:Gem::Requirement
|
199
211
|
requirements:
|
200
212
|
- - "~>"
|
201
213
|
- !ruby/object:Gem::Version
|
202
|
-
version: '
|
214
|
+
version: '2.0'
|
215
|
+
- - ">="
|
216
|
+
- !ruby/object:Gem::Version
|
217
|
+
version: 2.0.2
|
203
218
|
type: :runtime
|
204
219
|
prerelease: false
|
205
220
|
version_requirements: !ruby/object:Gem::Requirement
|
206
221
|
requirements:
|
207
222
|
- - "~>"
|
208
223
|
- !ruby/object:Gem::Version
|
209
|
-
version: '
|
224
|
+
version: '2.0'
|
225
|
+
- - ">="
|
226
|
+
- !ruby/object:Gem::Version
|
227
|
+
version: 2.0.2
|
210
228
|
- !ruby/object:Gem::Dependency
|
211
229
|
name: sinatra-contrib
|
212
230
|
requirement: !ruby/object:Gem::Requirement
|
213
231
|
requirements:
|
214
232
|
- - "~>"
|
215
233
|
- !ruby/object:Gem::Version
|
216
|
-
version:
|
234
|
+
version: 1.4.7
|
217
235
|
type: :runtime
|
218
236
|
prerelease: false
|
219
237
|
version_requirements: !ruby/object:Gem::Requirement
|
220
238
|
requirements:
|
221
239
|
- - "~>"
|
222
240
|
- !ruby/object:Gem::Version
|
223
|
-
version:
|
241
|
+
version: 1.4.7
|
224
242
|
- !ruby/object:Gem::Dependency
|
225
243
|
name: sinatra-partial
|
226
244
|
requirement: !ruby/object:Gem::Requirement
|
227
245
|
requirements:
|
228
246
|
- - "~>"
|
229
247
|
- !ruby/object:Gem::Version
|
230
|
-
version:
|
248
|
+
version: 1.0.0
|
231
249
|
type: :runtime
|
232
250
|
prerelease: false
|
233
251
|
version_requirements: !ruby/object:Gem::Requirement
|
234
252
|
requirements:
|
235
253
|
- - "~>"
|
236
254
|
- !ruby/object:Gem::Version
|
237
|
-
version:
|
255
|
+
version: 1.0.0
|
238
256
|
- !ruby/object:Gem::Dependency
|
239
257
|
name: sinatra-flash
|
240
258
|
requirement: !ruby/object:Gem::Requirement
|
241
259
|
requirements:
|
242
260
|
- - "~>"
|
243
261
|
- !ruby/object:Gem::Version
|
244
|
-
version:
|
262
|
+
version: 0.3.0
|
245
263
|
type: :runtime
|
246
264
|
prerelease: false
|
247
265
|
version_requirements: !ruby/object:Gem::Requirement
|
248
266
|
requirements:
|
249
267
|
- - "~>"
|
250
268
|
- !ruby/object:Gem::Version
|
251
|
-
version:
|
269
|
+
version: 0.3.0
|
252
270
|
- !ruby/object:Gem::Dependency
|
253
271
|
name: thin
|
254
272
|
requirement: !ruby/object:Gem::Requirement
|
255
273
|
requirements:
|
256
274
|
- - "~>"
|
257
275
|
- !ruby/object:Gem::Version
|
258
|
-
version:
|
276
|
+
version: 1.7.0
|
259
277
|
type: :runtime
|
260
278
|
prerelease: false
|
261
279
|
version_requirements: !ruby/object:Gem::Requirement
|
262
280
|
requirements:
|
263
281
|
- - "~>"
|
264
282
|
- !ruby/object:Gem::Version
|
265
|
-
version:
|
283
|
+
version: 1.7.0
|
266
284
|
- !ruby/object:Gem::Dependency
|
267
285
|
name: rake
|
268
286
|
requirement: !ruby/object:Gem::Requirement
|
269
287
|
requirements:
|
270
288
|
- - "~>"
|
271
289
|
- !ruby/object:Gem::Version
|
272
|
-
version:
|
290
|
+
version: 11.3.0
|
273
291
|
type: :runtime
|
274
292
|
prerelease: false
|
275
293
|
version_requirements: !ruby/object:Gem::Requirement
|
276
294
|
requirements:
|
277
295
|
- - "~>"
|
278
296
|
- !ruby/object:Gem::Version
|
279
|
-
version:
|
297
|
+
version: 11.3.0
|
280
298
|
- !ruby/object:Gem::Dependency
|
281
299
|
name: sqlite3
|
282
300
|
requirement: !ruby/object:Gem::Requirement
|
283
301
|
requirements:
|
284
302
|
- - "~>"
|
285
303
|
- !ruby/object:Gem::Version
|
286
|
-
version:
|
304
|
+
version: 1.3.12
|
287
305
|
type: :runtime
|
288
306
|
prerelease: false
|
289
307
|
version_requirements: !ruby/object:Gem::Requirement
|
290
308
|
requirements:
|
291
309
|
- - "~>"
|
292
310
|
- !ruby/object:Gem::Version
|
293
|
-
version:
|
311
|
+
version: 1.3.12
|
294
312
|
- !ruby/object:Gem::Dependency
|
295
313
|
name: pony
|
296
314
|
requirement: !ruby/object:Gem::Requirement
|
@@ -311,28 +329,28 @@ dependencies:
|
|
311
329
|
requirements:
|
312
330
|
- - "~>"
|
313
331
|
- !ruby/object:Gem::Version
|
314
|
-
version: 0.
|
332
|
+
version: 0.4.5
|
315
333
|
type: :runtime
|
316
334
|
prerelease: false
|
317
335
|
version_requirements: !ruby/object:Gem::Requirement
|
318
336
|
requirements:
|
319
337
|
- - "~>"
|
320
338
|
- !ruby/object:Gem::Version
|
321
|
-
version: 0.
|
339
|
+
version: 0.4.5
|
322
340
|
- !ruby/object:Gem::Dependency
|
323
341
|
name: json-schema
|
324
342
|
requirement: !ruby/object:Gem::Requirement
|
325
343
|
requirements:
|
326
344
|
- - "~>"
|
327
345
|
- !ruby/object:Gem::Version
|
328
|
-
version:
|
346
|
+
version: 2.7.0
|
329
347
|
type: :runtime
|
330
348
|
prerelease: false
|
331
349
|
version_requirements: !ruby/object:Gem::Requirement
|
332
350
|
requirements:
|
333
351
|
- - "~>"
|
334
352
|
- !ruby/object:Gem::Version
|
335
|
-
version:
|
353
|
+
version: 2.7.0
|
336
354
|
- !ruby/object:Gem::Dependency
|
337
355
|
name: faker
|
338
356
|
requirement: !ruby/object:Gem::Requirement
|
@@ -397,6 +415,7 @@ files:
|
|
397
415
|
- lib/device_tracker/db/migrate/20151029085629_add_password_reset_code_to_users.rb
|
398
416
|
- lib/device_tracker/db/migrate/20151030130341_add_missing_column_to_devices.rb
|
399
417
|
- lib/device_tracker/db/migrate/20151102141601_add_serial_number_to_devices.rb
|
418
|
+
- lib/device_tracker/db/migrate/20161103135510_add_is_developer_to_users.rb
|
400
419
|
- lib/device_tracker/db/schema.rb
|
401
420
|
- lib/device_tracker/db/seeds.rb
|
402
421
|
- lib/device_tracker/dependencies.rb
|
@@ -498,7 +517,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
498
517
|
version: '0'
|
499
518
|
requirements: []
|
500
519
|
rubyforge_project:
|
501
|
-
rubygems_version: 2.
|
520
|
+
rubygems_version: 2.5.1
|
502
521
|
signing_key:
|
503
522
|
specification_version: 4
|
504
523
|
summary: A web app for managing mobile devices
|