From 18dc60cb2eb348aa1b4c1ed3717babd40d6c1293 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Apr 2017 18:10:38 +0530 Subject: [PATCH 1/3] Hide script field from List View --- .../doctype/custom_script/custom_script.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/custom/doctype/custom_script/custom_script.json b/frappe/custom/doctype/custom_script/custom_script.json index 5e35b00ae2..102e168d2d 100644 --- a/frappe/custom/doctype/custom_script/custom_script.json +++ b/frappe/custom/doctype/custom_script/custom_script.json @@ -1,5 +1,6 @@ { "allow_copy": 0, + "allow_guest_to_view": 0, "allow_import": 1, "allow_rename": 0, "autoname": "CustomScript.####", @@ -24,6 +25,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 1, "label": "DocType", @@ -55,6 +57,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 1, "in_standard_filter": 1, "label": "Script Type", @@ -85,6 +88,10 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, +<<<<<<< HEAD +======= + "in_global_search": 0, +>>>>>>> Hide script field from List View "in_list_view": 0, "in_standard_filter": 0, "label": "Script", @@ -115,6 +122,7 @@ "ignore_user_permissions": 0, "ignore_xss_filter": 0, "in_filter": 0, + "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, "label": "Sample", @@ -133,19 +141,19 @@ "unique": 0 } ], + "has_web_view": 0, "hide_heading": 0, "hide_toolbar": 0, "icon": "fa fa-glass", "idx": 1, "image_view": 0, "in_create": 0, - "in_dialog": 0, "is_submittable": 0, "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-12-29 14:40:24.037012", - "modified_by": "Administrator", + "modified": "2017-04-03 18:07:28.138437", + "modified_by": "faris@erpnext.com", "module": "Custom", "name": "Custom Script", "owner": "Administrator", @@ -160,7 +168,6 @@ "export": 0, "if_owner": 0, "import": 0, - "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -181,7 +188,6 @@ "export": 0, "if_owner": 0, "import": 0, - "is_custom": 0, "permlevel": 0, "print": 1, "read": 1, @@ -196,6 +202,7 @@ "quick_entry": 0, "read_only": 0, "read_only_onload": 0, + "show_name_in_global_search": 0, "sort_order": "ASC", "track_changes": 1, "track_seen": 0 From 05629b27b601bc0db08af8610c0c1ccae045ac78 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Apr 2017 21:07:44 +0530 Subject: [PATCH 2/3] [minor] Fix ellipsis, alignment in Subject column --- frappe/public/css/list.css | 1 + frappe/public/js/frappe/list/list_item_subject.html | 2 +- frappe/public/js/frappe/list/list_renderer.js | 3 --- frappe/public/less/list.less | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index 8e88423d78..8bc696f113 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -420,6 +420,7 @@ .list-item input[type=checkbox] { margin: 0; margin-right: 5px; + flex: 0 0 12px; } .list-item .liked-by, .list-item .liked-by-filter-button { diff --git a/frappe/public/js/frappe/list/list_item_subject.html b/frappe/public/js/frappe/list/list_item_subject.html index 2e9a5c04dc..41a18e9e04 100644 --- a/frappe/public/js/frappe/list/list_item_subject.html +++ b/frappe/public/js/frappe/list/list_item_subject.html @@ -11,7 +11,7 @@ -{{ strip_html(_title) }} diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index 51dde1da1e..fa250fd1c6 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -447,9 +447,6 @@ frappe.views.ListRenderer = Class.extend({ data._title = strip_html(data[title_field] || data.name); data._full_title = data._title; - if (data._title.length > 35) { - data._title = data._title.slice(0, 35) + '...'; - } data._workflow = null; if (this.workflow_state_fieldname) { diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index 0da6782f28..cfe5e120a8 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -514,6 +514,7 @@ input[type=checkbox] { margin: 0; margin-right: 5px; + flex: 0 0 12px; } .liked-by, .liked-by-filter-button { From 70859ba621535636c33e0044fe26a4e943516fae Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Apr 2017 21:11:51 +0530 Subject: [PATCH 3/3] Remove conflict --- frappe/custom/doctype/custom_script/custom_script.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/custom/doctype/custom_script/custom_script.json b/frappe/custom/doctype/custom_script/custom_script.json index 102e168d2d..644fcb7986 100644 --- a/frappe/custom/doctype/custom_script/custom_script.json +++ b/frappe/custom/doctype/custom_script/custom_script.json @@ -87,11 +87,8 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, -<<<<<<< HEAD -======= + "in_filter": 0, "in_global_search": 0, ->>>>>>> Hide script field from List View "in_list_view": 0, "in_standard_filter": 0, "label": "Script",