From 231b36a51b38d73c632befd4302ffab84b9a83be Mon Sep 17 00:00:00 2001 From: sahil28297 <37302950+sahil28297@users.noreply.github.com> Date: Thu, 20 Sep 2018 16:23:18 +0530 Subject: [PATCH] Make datatable non-editable in Report and formula field selectable (#85) * making the datatable fields non editable and making the field selectable that uses formula * Revised the datatable selectable property * Update index.vue --- client/ui/utils.js | 2 +- ui/components/controls/FrappeControl.vue | 4 ---- ui/pages/Report/index.vue | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ui/utils.js b/client/ui/utils.js index dd38f281..32de5837 100644 --- a/client/ui/utils.js +++ b/client/ui/utils.js @@ -58,4 +58,4 @@ module.exports = { $child.classList.add(activeClass); } -} \ No newline at end of file +} diff --git a/ui/components/controls/FrappeControl.vue b/ui/components/controls/FrappeControl.vue index 471c1223..1839a4fe 100644 --- a/ui/components/controls/FrappeControl.vue +++ b/ui/components/controls/FrappeControl.vue @@ -67,10 +67,6 @@ export default { disabled = true; } - if (this.docfield.formula && this.docfield.fieldtype !== 'Table') { - disabled = true; - } - return Boolean(disabled); } } diff --git a/ui/pages/Report/index.vue b/ui/pages/Report/index.vue index e921a8cf..e767b6c7 100644 --- a/ui/pages/Report/index.vue +++ b/ui/pages/Report/index.vue @@ -53,6 +53,10 @@ export default { columns = this.reportColumns; } + for(let column of columns) { + column.editable = false; + } + if (this.datatable) { this.datatable.refresh(rows, columns); } else {