five-two-nw-olivander 0.1.2.54 → 0.1.2.56
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c375be3fe2ce5dbfceaa1e12970b854f5cf2cd5736235ce2c8dba116e3a08bc6
|
4
|
+
data.tar.gz: 4a28b8b8495f6509047fed0ff810b2f773d7c867101413d319f81720a9fd96cc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3efdab042d7beb478fb17125e1dfcd029baa6554ced91ae946486303d4966ae398b42d4c89b3923c7cb5da60794b20c863f595e096f2b7ab1edd255bd0cdcc4c
|
7
|
+
data.tar.gz: 20b769eddd5030e3ba3f444ab67266d28546598b85aceff5023ddfc010e2dac50f5b31054fcf8c1d2a0601eb5dfb70358b5cc5b1606dec713ad78987a78336cd
|
@@ -9,8 +9,20 @@ export default class extends Controller {
|
|
9
9
|
var jsonCharts = dt.json.charts
|
10
10
|
for (var chart in jsonCharts) {
|
11
11
|
var chartkickChart = Chartkick.charts[chart]
|
12
|
+
chartkickChart.updateData(self.transformData(jsonCharts[chart]))
|
12
13
|
chartkickChart.redraw()
|
13
14
|
}
|
14
15
|
});
|
15
16
|
}
|
17
|
+
|
18
|
+
transformData(chart) {
|
19
|
+
var self = this
|
20
|
+
console.log("let's transform some data")
|
21
|
+
if (chart.as == 'LineChart') {
|
22
|
+
// we don't know what to do
|
23
|
+
return chart.data
|
24
|
+
} else {
|
25
|
+
return chart.data
|
26
|
+
}
|
27
|
+
}
|
16
28
|
}
|
@@ -51,10 +51,11 @@ module Olivander
|
|
51
51
|
if bulk_action_list.size.positive?
|
52
52
|
bulk_actions do
|
53
53
|
bulk_action_list.each do |ma|
|
54
|
+
label = resource_form_action_label(instance, ma.action)
|
54
55
|
if ma.confirm
|
55
|
-
bulk_action
|
56
|
+
bulk_action label, url_for(controller: ma.controller, action: "confirm_#{ma.action}")
|
56
57
|
else
|
57
|
-
bulk_action
|
58
|
+
bulk_action label, send(ma.path_helper), data: { turbo_frame: ma.turbo_frame }
|
58
59
|
end
|
59
60
|
end
|
60
61
|
end
|
@@ -62,8 +63,6 @@ module Olivander
|
|
62
63
|
|
63
64
|
datatable do
|
64
65
|
order(order_by[0], order_by[1]) if order_by.size == 2
|
65
|
-
Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size}"
|
66
|
-
Rails.logger.debug "bulk actions size: #{datatable._bulk_actions.size.positive?}"
|
67
66
|
# bulk_actions_col if datatable._bulk_actions.size.positive?
|
68
67
|
|
69
68
|
#TODO: use columns from model here instead of attributes keys
|
@@ -3,8 +3,7 @@ module Olivander
|
|
3
3
|
self.abstract_class = true
|
4
4
|
|
5
5
|
def self.audited_as klazz
|
6
|
-
Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
|
7
|
-
|
6
|
+
# Rails.logger.debug "#{self.class.name} is audited as #{klazz.name}"
|
8
7
|
@@audited_user_class = klazz
|
9
8
|
|
10
9
|
belongs_to :created_by, class_name: klazz.name
|
data/lib/olivander/version.rb
CHANGED