From fa22e75afc4551dac51fdce40de75c8531037878 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 11 Jun 2014 15:50:44 +0530 Subject: [PATCH 1/3] reportview.js: fix select order --- frappe/public/js/frappe/views/reportview.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reportview.js b/frappe/public/js/frappe/views/reportview.js index 1f0d66942a..5a7c4d8e83 100644 --- a/frappe/public/js/frappe/views/reportview.js +++ b/frappe/public/js/frappe/views/reportview.js @@ -598,7 +598,15 @@ frappe.ui.ColumnPicker = Class.extend({ me.add_column(c); }); - $(this.dialog.body).find('.column-list').sortable(); + $(this.dialog.body).find('.column-list').sortable({ + update: function(event, ui) { + me.columns = []; + $.each($(me.dialog.body).find('.column-list .column-list-item'), + function(i, ele) { + me.columns.push($(ele).data("fieldselect")) + }); + } + }); // add column $(this.dialog.body).find('.btn-add').click(function() { @@ -623,7 +631,7 @@ frappe.ui.ColumnPicker = Class.extend({ add_column: function(c) { if(!c) return; var w = $('
\ + width: 90%; margin-bottom: 10px; border-radius: 3px; cursor: move;" class="column-list-item">\ \ ×\
') @@ -637,6 +645,8 @@ frappe.ui.ColumnPicker = Class.extend({ fieldselect.$select.css({width: '70%', 'margin-top':'5px'}) fieldselect.val((c[1] || this.doctype) + "." + c[0]); + w.data("fieldselect", fieldselect); + w.find('.close').data("fieldselect", fieldselect).click(function() { console.log(me.columns.indexOf($(this).data('fieldselect'))); delete me.columns[me.columns.indexOf($(this).data('fieldselect'))]; From 34ad49070ff9f3ea24a92c1abdf1318ac0d9d682 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 12 Jun 2014 10:35:11 +0530 Subject: [PATCH 2/3] added system manager read on module def --- .../core/doctype/module_def/module_def.json | 79 ++++++++++--------- .../public/js/frappe/views/communication.js | 3 +- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/frappe/core/doctype/module_def/module_def.json b/frappe/core/doctype/module_def/module_def.json index 34bca1659b..49dc29c61b 100644 --- a/frappe/core/doctype/module_def/module_def.json +++ b/frappe/core/doctype/module_def/module_def.json @@ -1,49 +1,54 @@ { - "allow_rename": 1, - "autoname": "field:module_name", - "creation": "2013-01-10 16:34:03", - "docstatus": 0, - "doctype": "DocType", + "allow_rename": 1, + "autoname": "field:module_name", + "creation": "2013-01-10 16:34:03", + "docstatus": 0, + "doctype": "DocType", "fields": [ { - "fieldname": "module_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Module Name", - "oldfieldname": "module_name", - "oldfieldtype": "Data", + "fieldname": "module_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Module Name", + "oldfieldname": "module_name", + "oldfieldtype": "Data", "permlevel": 0 - }, + }, { - "fieldname": "app_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "App Name", - "permlevel": 0, + "fieldname": "app_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "App Name", + "permlevel": 0, "reqd": 1 } - ], - "icon": "icon-sitemap", - "idx": 1, - "modified": "2014-05-26 03:35:50.991776", - "modified_by": "Administrator", - "module": "Core", - "name": "Module Def", - "owner": "Administrator", + ], + "icon": "icon-sitemap", + "idx": 1, + "modified": "2014-06-12 01:00:52.304755", + "modified_by": "Administrator", + "module": "Core", + "name": "Module Def", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "submit": 0, + "amend": 0, + "cancel": 0, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "submit": 0, "write": 1 + }, + { + "permlevel": 0, + "read": 1, + "role": "System Manager" } ] -} +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index d93204cfb0..2f8b284b58 100644 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -365,7 +365,8 @@ frappe.views.CommunicationComposer = Class.extend({ if(comm_list.length > 0) { fields.content.set_input(reply + "

" - +"-----"+__("In response to")+"-----

" + +"-----"+__("In response to")+"-----" + +"

"+__("Please reply above this line or remove it if you are replying below it")+"



" + comm_list[0].content); } else { fields.content.set_input(reply); From b1088ff95e97f3ae442982555ad1d2823ad68aa3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 12 Jun 2014 14:12:19 +0530 Subject: [PATCH 3/3] query_report.js: fix left margin for checkbox --- frappe/public/js/frappe/views/query_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/query_report.js b/frappe/public/js/frappe/views/query_report.js index b258cfa597..3575f5c07b 100644 --- a/frappe/public/js/frappe/views/query_report.js +++ b/frappe/public/js/frappe/views/query_report.js @@ -138,7 +138,7 @@ frappe.views.QueryReport = Class.extend({ f.set_input(df["default"]); } if(df.fieldtype=="Check") { - $(f.wrapper).find("input[type='checkbox']").css({"float":"None"}); + $(f.wrapper).find("input[type='checkbox']").css({"float":"None", "margin-left": "0px"}); } if(df.get_query) f.get_query = df.get_query;