From 979ddb14fa8537e360819ca2be037eb75a21f40b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 17 Feb 2017 14:19:42 +0530 Subject: [PATCH] [fixes] 403 in request, grid tabbing and global search in install --- frappe/core/doctype/doctype/doctype.py | 2 +- frappe/public/css/docs.css | 7 ++++++- frappe/public/js/frappe/form/grid.js | 2 +- frappe/public/js/frappe/request.js | 17 +++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 9cdbadb9bf..a85da072c1 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -225,7 +225,7 @@ class DocType(Document): if set(global_search_fields_before_update) != set(global_search_fields_after_update): frappe.enqueue('frappe.utils.global_search.rebuild_for_doctype', - now=frappe.flags.in_test, doctype=self.name) + now=frappe.flags.in_test or frappe.flags.in_install, doctype=self.name) def run_module_method(self, method): from frappe.modules import load_doctype_module diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 3777acd366..fdce99fec7 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -135,6 +135,11 @@ .navbar-form .awesomplete { width: 300px; } +@media (max-width: 1199px) { + .navbar-form .awesomplete { + width: 280px; + } +} @media (max-width: 991px) { .navbar-form .awesomplete { width: 250px; @@ -200,7 +205,7 @@ } } .toolbar-user-fullname { - max-width: 200px; + max-width: 150px; display: inline-block; } .navbar-brand { diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index bcf309e558..9e1608cd79 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -950,7 +950,7 @@ frappe.ui.form.GridRow = Class.extend({ return; } - var values = me.get_data(); + var values = me.grid.get_data(); var fieldname = $(this).attr('data-fieldname'); var fieldtype = $(this).attr('data-fieldtype'); diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index fd310b182b..92767c5608 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -158,12 +158,17 @@ frappe.request.call = function(opts) { } }) .always(function(data, textStatus, xhr) { - if(typeof data==="string") { - data = JSON.parse(data); - } - if(data.responseText) { - var xhr = data; - data = JSON.parse(data.responseText); + try { + if(typeof data==="string") { + data = JSON.parse(data); + } + if(data.responseText) { + var xhr = data; + data = JSON.parse(data.responseText); + } + } catch(e) { + data = null; + // pass } frappe.request.cleanup(opts, data); if(opts.always) {