marty 2.3.4 → 2.3.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/components/marty/api_log_view.rb +5 -5
- data/app/components/marty/grid.rb +9 -2
- data/app/components/marty/log_view.rb +2 -2
- data/lib/marty/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1d649917183fda05f2022f0d9ed399acdf58d50f
|
|
4
|
+
data.tar.gz: 4a3276efd02fd70f6a4d5f940936c396ac24b74c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 47959742294ec7c13d84abcd73f830975bb472986ee87eda06f0cd4a1bf4c441008b9e42154ffd4b12a83a4c3c5c8bf9cbe5c860f3acaaf8008236aad0ef9782
|
|
7
|
+
data.tar.gz: 7af35a03b0480c2cfce4f917586e5058395cc5a6aa20324111ee665918d6fc424dca8c2fb2772a43c3d914a5b4d5671cb840272a409cdce2ccd0c34f02377383
|
data/Gemfile.lock
CHANGED
|
@@ -24,12 +24,12 @@ class Marty::ApiLogView < Marty::Grid
|
|
|
24
24
|
|
|
25
25
|
def configure(c)
|
|
26
26
|
super
|
|
27
|
-
c.editing
|
|
28
|
-
c.paging
|
|
29
|
-
c.title
|
|
30
|
-
c.model
|
|
27
|
+
c.editing = :in_form
|
|
28
|
+
c.paging = :pagination
|
|
29
|
+
c.title = 'Api Log View'
|
|
30
|
+
c.model = Marty::Log
|
|
31
31
|
c.attributes = @@attrs
|
|
32
|
-
c.scope
|
|
32
|
+
c.scope = {message_type: 'api'}
|
|
33
33
|
c.store_config.merge!(sorters: [{property: :timestamp, direction: 'DESC'}])
|
|
34
34
|
end
|
|
35
35
|
|
|
@@ -52,8 +52,15 @@ class Marty::Grid < ::Netzke::Grid::Base
|
|
|
52
52
|
'selectionchange',
|
|
53
53
|
function(m) {
|
|
54
54
|
var has_sel = m.hasSelection();
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
|
|
56
|
+
var rid = null;
|
|
57
|
+
if (has_sel) {
|
|
58
|
+
if (m.type == 'spreadsheet') {
|
|
59
|
+
rid = m.getSelected().startCell.record.getId()
|
|
60
|
+
} else {
|
|
61
|
+
rid = m.getSelection()[0].getId()
|
|
62
|
+
}
|
|
63
|
+
}
|
|
57
64
|
|
|
58
65
|
me.serverConfig.selected = rid;
|
|
59
66
|
|
|
@@ -6,9 +6,9 @@ class Marty::LogView < Marty::Grid
|
|
|
6
6
|
def configure(c)
|
|
7
7
|
super
|
|
8
8
|
|
|
9
|
-
c.title
|
|
9
|
+
c.title ||= I18n.t('log_viewer', default: "Log Viewer")
|
|
10
10
|
c.model = "Marty::Log"
|
|
11
|
-
c.paging = :
|
|
11
|
+
c.paging = :pagination
|
|
12
12
|
c.editing = :in_form
|
|
13
13
|
c.attributes = [
|
|
14
14
|
:timestamp_custom,
|
data/lib/marty/version.rb
CHANGED
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: 2.3.
|
|
4
|
+
version: 2.3.5
|
|
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: 2018-
|
|
17
|
+
date: 2018-09-04 00:00:00.000000000 Z
|
|
18
18
|
dependencies:
|
|
19
19
|
- !ruby/object:Gem::Dependency
|
|
20
20
|
name: pg
|