marty 5.1.0 → 5.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/app/components/marty/main_auth_app.rb +3 -3
- data/lib/marty/version.rb +1 -1
- data/spec/features/user_view_spec.rb +1 -1
- data/spec/support/users.rb +1 -8
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 4c6789a008b449b0a585b9c6f334c11f8638a6718cd01092fd85e311498a6fa1
|
4
|
+
data.tar.gz: 5652a3674034c14a53356426522854ccd5d458475757ccd53b5f62a6d43e006e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5172bf0b5cc30b6954498b2af539314794316c0cd75cb00c232bc7f6288de91c9dbaffe048de3cef3c438fff93af45b7b1f5e7b12293d71d965d62dff4880cdd
|
7
|
+
data.tar.gz: 5b5015dd73fe163c2ad24b8855ec9e0e122417a81b458950e94214a57d2cf31e85d8d3dce1b3d907077a6e4241c4a42c203d68a5003787a387d851019ad594dc
|
@@ -51,7 +51,7 @@ class Marty::MainAuthApp < Marty::AuthApp
|
|
51
51
|
{
|
52
52
|
text: 'Log Maintenance',
|
53
53
|
icon_cls: 'fa fa-wrench glyph',
|
54
|
-
disabled: !self.class.has_perm?(:admin),
|
54
|
+
disabled: !(self.class.has_perm?(:admin) || self.class.has_perm?(:dev)),
|
55
55
|
menu: [
|
56
56
|
:log_view,
|
57
57
|
:log_cleanup,
|
@@ -153,7 +153,7 @@ class Marty::MainAuthApp < Marty::AuthApp
|
|
153
153
|
return super unless self.class.has_any_perm?
|
154
154
|
|
155
155
|
[ident_menu, sep] +
|
156
|
-
(self.class.has_perm?(:admin) ||
|
156
|
+
(self.class.has_perm?(:admin) || self.class.has_perm?(:dev) ||
|
157
157
|
self.class.has_perm?(:user_manager) ? [system_menu, sep] : []) +
|
158
158
|
data_menus +
|
159
159
|
[
|
@@ -300,7 +300,7 @@ class Marty::MainAuthApp < Marty::AuthApp
|
|
300
300
|
a.tooltip = 'View Log'
|
301
301
|
a.handler = :netzke_load_component_by_action
|
302
302
|
a.icon_cls = 'fa fa-cog glyph'
|
303
|
-
a.disabled = !self.class.has_perm?(:admin)
|
303
|
+
a.disabled = !(self.class.has_perm?(:admin) || self.class.has_perm?(:dev))
|
304
304
|
end
|
305
305
|
|
306
306
|
action :log_cleanup do |a|
|
data/lib/marty/version.rb
CHANGED
@@ -156,7 +156,7 @@ feature 'under System menu, User Management worflows', js: true do
|
|
156
156
|
|
157
157
|
it 'developer denied access' do
|
158
158
|
log_in_as('dev1')
|
159
|
-
|
159
|
+
ensure_on('/#userView')
|
160
160
|
|
161
161
|
user_view = netzke_find('user_view')
|
162
162
|
by 'check buttons' do
|
data/spec/support/users.rb
CHANGED
@@ -11,14 +11,7 @@ module Marty; module RSpec; module Users
|
|
11
11
|
user.active = true
|
12
12
|
user.save
|
13
13
|
|
14
|
-
role
|
15
|
-
|
16
|
-
raise "Oops unknown role: #{role_name}. Was db seeded?" unless role
|
17
|
-
|
18
|
-
user_role = Marty::UserRole.new
|
19
|
-
user_role.user = user
|
20
|
-
user_role.role = role
|
21
|
-
user_role.save!
|
14
|
+
Marty::UserRole.create(user_id: user.id, role: role_name)
|
22
15
|
end
|
23
16
|
end
|
24
17
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: marty
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.1.
|
4
|
+
version: 5.1.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arman Bostani
|
@@ -14,7 +14,7 @@ authors:
|
|
14
14
|
autorequire:
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
|
-
date: 2019-07
|
17
|
+
date: 2019-08-07 00:00:00.000000000 Z
|
18
18
|
dependencies:
|
19
19
|
- !ruby/object:Gem::Dependency
|
20
20
|
name: aws-sigv4
|
@@ -1694,7 +1694,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1694
1694
|
version: '0'
|
1695
1695
|
requirements: []
|
1696
1696
|
rubyforge_project:
|
1697
|
-
rubygems_version: 2.
|
1697
|
+
rubygems_version: 2.7.8
|
1698
1698
|
signing_key:
|
1699
1699
|
specification_version: 4
|
1700
1700
|
summary: A framework for working with versioned data
|