From 65bf0e710504fb9b17c65607c97a82673066be39 Mon Sep 17 00:00:00 2001 From: Eric Wamugu Date: Wed, 5 Jul 2017 12:43:40 +0300 Subject: [PATCH 1/3] Add export feature for charts as a PNG image --- httpsdocs/js/widget/block/Chart.js | 12 ++++++++++++ logs/.gitignore | 0 2 files changed, 12 insertions(+) mode change 100644 => 100755 logs/.gitignore diff --git a/httpsdocs/js/widget/block/Chart.js b/httpsdocs/js/widget/block/Chart.js index da401688..909dce15 100644 --- a/httpsdocs/js/widget/block/Chart.js +++ b/httpsdocs/js/widget/block/Chart.js @@ -27,6 +27,18 @@ Ext.define('CB.widget.block.Chart', { scope: this ,afterrender: this.onAfterRender } + ,dockedItems: [{ + xtype: 'toolbar', + items: [{ + xtype: 'button', + text: 'Download Chart as PNG Image', + handler: function(btn, e, eOpts) { + btn.up('CBWidgetBlockChart').down("chart").save({ + type: "image/png" + }) + } + }] + }] }); this.callParent(arguments); diff --git a/logs/.gitignore b/logs/.gitignore old mode 100644 new mode 100755 From 4e0cf4357d643c6c5928af0845eb9d03a03c3f94 Mon Sep 17 00:00:00 2001 From: Eric Wamugu Date: Wed, 5 Jul 2017 12:51:57 +0300 Subject: [PATCH 2/3] Add export feature for charts to a PNG image --- httpsdocs/js/widget/block/Chart.js | 1 - 1 file changed, 1 deletion(-) diff --git a/httpsdocs/js/widget/block/Chart.js b/httpsdocs/js/widget/block/Chart.js index 909dce15..2a6ff97d 100644 --- a/httpsdocs/js/widget/block/Chart.js +++ b/httpsdocs/js/widget/block/Chart.js @@ -22,7 +22,6 @@ Ext.define('CB.widget.block.Chart', { type: 'vbox' ,pack: 'top' } - ,listeners: { scope: this ,afterrender: this.onAfterRender From 38b1dd2608db95c0f251d4155709d3200a3bdfe8 Mon Sep 17 00:00:00 2001 From: Eric Wamugu Date: Wed, 5 Jul 2017 13:02:27 +0300 Subject: [PATCH 3/3] Fix for PHP 7 in how it resolves variables strictly from left to right --- httpsdocs/classes/CB/Browser.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httpsdocs/classes/CB/Browser.php b/httpsdocs/classes/CB/Browser.php index 9b39f965..43f5cf0f 100644 --- a/httpsdocs/classes/CB/Browser.php +++ b/httpsdocs/classes/CB/Browser.php @@ -393,7 +393,7 @@ public function getObjectsForField($p) if (!empty($fieldConfig['source']['fn'])) { $method = explode('.', $fieldConfig['source']['fn']); $class = new $method[0](); - $rez = $class->$method[1]($p); + $rez = $class->{$method[1]}($p); // if custom source returned any result then return it right there // otherwise custom source can add some filtering params and we go further processing @@ -610,7 +610,7 @@ public function getObjectsForField($p) $search = new Search(); - + if (!isset($p['skipSecurity'])) { // temporary: Don't use permissions for Objects fields // it can be later reinforced per field in config