marty 3.1.0 → 4.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -7
- data/.rubocop.yml +0 -1
- data/.rubocop_todo.yml +15 -2
- data/Dockerfile.dummy +0 -3
- data/Gemfile +15 -21
- data/Gemfile.lock +289 -0
- data/app/components/marty/data_grid_view.rb +18 -68
- data/app/components/marty/extras/layout.rb +1 -1
- data/app/components/marty/grid.rb +1 -1
- data/app/components/marty/import_view.rb +3 -3
- data/app/components/marty/main_auth_app.rb +1 -11
- data/app/components/marty/report_form.rb +6 -6
- data/app/components/marty/script_form.rb +5 -5
- data/app/components/marty/script_tester.rb +2 -2
- data/app/components/marty/user_view.rb +9 -3
- data/app/models/marty/data_grid.rb +11 -16
- data/app/models/marty/event.rb +2 -2
- data/app/models/marty/promise.rb +4 -4
- data/app/models/marty/role_type.rb +1 -14
- data/app/services/marty/data_grid_view/save_grid.rb +2 -2
- data/app/services/marty/promises/delorean/create.rb +2 -2
- data/app/services/marty/promises/ruby/create.rb +2 -2
- data/config/locales/en.yml +2 -11
- data/docker-compose.dummy.yml +0 -1
- data/lib/marty/content_handler.rb +2 -2
- data/lib/marty/data_change.rb +1 -1
- data/lib/marty/data_conversion.rb +4 -3
- data/lib/marty/data_importer.rb +4 -4
- data/lib/marty/mcfly_model.rb +10 -7
- data/lib/marty/migrations.rb +1 -1
- data/lib/marty/monkey.rb +2 -2
- data/lib/marty/promise_job.rb +5 -5
- data/lib/marty/promise_proxy.rb +2 -2
- data/lib/marty/promise_ruby_job.rb +4 -4
- data/lib/marty/version.rb +1 -1
- data/marty.gemspec +18 -13
- data/other/marty/diagnostic/aws/ec2_instance.rb +2 -17
- data/other/marty/diagnostic/database.rb +2 -2
- data/other/marty/diagnostic/delayed_job_version.rb +1 -0
- data/spec/dummy/app/models/gemini/fannie_bup.rb +20 -13
- data/spec/dummy/config/application.rb +0 -1
- data/spec/dummy/config/initializers/secret_token.rb +1 -1
- data/spec/features/data_grid_spec.rb +46 -109
- data/spec/features/reporting_spec.rb +4 -4
- data/spec/features/rule_spec.rb +1 -1
- data/spec/features/scripting_spec.rb +3 -3
- data/spec/features/user_view_spec.rb +8 -17
- data/spec/lib/data_importer_spec.rb +8 -8
- data/spec/lib/mcfly_model_spec.rb +6 -6
- data/spec/models/data_grid_spec.rb +4 -19
- data/spec/spec_helper.rb +2 -2
- data/spec/support/netzke.rb +3 -4
- metadata +53 -50
- data/.ssh-docker/.keep +0 -0
- data/app/components/marty/data_grid_user_view.rb +0 -39
- data/db/migrate/108_add_data_grid_perms.rb +0 -16
- data/other/marty/diagnostic/aws/error.rb +0 -8
data/.ssh-docker/.keep
DELETED
|
File without changes
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
module Marty
|
|
2
|
-
class DataGridUserView < DataGridView
|
|
3
|
-
has_marty_permissions read: [:data_grid_editor, :admin, :dev]
|
|
4
|
-
|
|
5
|
-
def configure(c)
|
|
6
|
-
super
|
|
7
|
-
|
|
8
|
-
c.attributes =
|
|
9
|
-
[
|
|
10
|
-
:name,
|
|
11
|
-
:created_dt,
|
|
12
|
-
]
|
|
13
|
-
c.editing = :inline
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def default_bbar
|
|
17
|
-
[:edit_grid]
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def get_records(params)
|
|
21
|
-
cur_perms = Mcfly.whodunnit.roles.map(&:to_sym)
|
|
22
|
-
model.where("permissions->'view' ?| ARRAY[:roles] OR "\
|
|
23
|
-
"permissions->'edit_data' ?| ARRAY[:roles] OR "\
|
|
24
|
-
"permissions->'edit_all' ?| ARRAY[:roles]",
|
|
25
|
-
roles: cur_perms).scoping do
|
|
26
|
-
super
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def self.get_edit_permission(permissions)
|
|
31
|
-
cur_perms = current_user_roles.map(&:to_s)
|
|
32
|
-
['edit_all', 'edit_data', 'view'].detect do |p|
|
|
33
|
-
permissions[p] - cur_perms != permissions[p]
|
|
34
|
-
end
|
|
35
|
-
end
|
|
36
|
-
end
|
|
37
|
-
end
|
|
38
|
-
|
|
39
|
-
DataGridUserView = Marty::DataGridUserView
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
class AddDataGridPerms < ActiveRecord::Migration[4.2]
|
|
2
|
-
def self.up
|
|
3
|
-
default = {
|
|
4
|
-
view: [],
|
|
5
|
-
edit_data: [],
|
|
6
|
-
edit_all: []
|
|
7
|
-
}
|
|
8
|
-
table = :marty_data_grids
|
|
9
|
-
add_column table, :permissions, :jsonb, null: false, default: default
|
|
10
|
-
add_index table, "(permissions->'view')", using: "GIN",
|
|
11
|
-
name: :marty_data_grids_perm_idx
|
|
12
|
-
end
|
|
13
|
-
def self.down
|
|
14
|
-
remove_column :marty_data_grids, :permissions
|
|
15
|
-
end
|
|
16
|
-
end
|