From 7fc4c4a82a609073120f6a78f048d233515ae603 Mon Sep 17 00:00:00 2001 From: shreyas Date: Fri, 28 Oct 2016 17:37:14 +0530 Subject: [PATCH 1/4] [Minor] Added validation to bulk update in case user does not specify value field --- .../desk/doctype/bulk_update/bulk_update.js | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/frappe/desk/doctype/bulk_update/bulk_update.js b/frappe/desk/doctype/bulk_update/bulk_update.js index 8f39ab27a3..cfee158ac7 100644 --- a/frappe/desk/doctype/bulk_update/bulk_update.js +++ b/frappe/desk/doctype/bulk_update/bulk_update.js @@ -4,19 +4,24 @@ frappe.ui.form.on('Bulk Update', { refresh: function(frm) { frm.page.set_primary_action(__('Update'), function() { - frappe.call({ - method: 'frappe.desk.doctype.bulk_update.bulk_update.update', - args: { - doctype: frm.doc.document_type, - field: frm.doc.field, - value: frm.doc.update_value, - condition: frm.doc.condition, - limit: frm.doc.limit - }, - callback: function() { - frappe.hide_progress(); - } - }); + if(!frm.doc.update_value){ + frappe.throw(__('Field "value" is mandatory. Please specify value to be updated')); + } + else{ + frappe.call({ + method: 'frappe.desk.doctype.bulk_update.bulk_update.update', + args: { + doctype: frm.doc.document_type, + field: frm.doc.field, + value: frm.doc.update_value, + condition: frm.doc.condition, + limit: frm.doc.limit + }, + callback: function() { + frappe.hide_progress(); + } + }); + } }); }, document_type: function(frm) { From 371d9d1f758d9e5189c8843ce8d3421f2e5edbe8 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 31 Oct 2016 11:41:55 +0530 Subject: [PATCH 2/4] [minor][fix] path fixes for manual dropbox backup --- .../doctype/integration_service/integration_service.js | 5 +++++ .../doctype/dropbox_settings/dropbox_settings.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/integration_broker/doctype/integration_service/integration_service.js b/frappe/integration_broker/doctype/integration_service/integration_service.js index 04c407dc3e..34e1220d26 100644 --- a/frappe/integration_broker/doctype/integration_service/integration_service.js +++ b/frappe/integration_broker/doctype/integration_service/integration_service.js @@ -25,6 +25,11 @@ frappe.ui.form.on('Integration Service', { } }, + service: function(frm){ + frm.events.setup_custom_buttons(frm); + frm.events.setup_service_details(frm); + }, + setup_custom_buttons: function(frm) { frm.add_custom_button(__("{0} Settings", [frm.doc.service]), function(){ frappe.set_route("List", frm.doc.service + " Settings"); diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.js b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.js index c9427e8183..56eda76c66 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.js +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.js @@ -31,7 +31,7 @@ frappe.ui.form.on('Dropbox Settings', { if (frm.doc.app_access_key && frm.doc.app_secret_key && frm.doc.dropbox_access_key && frm.doc.dropbox_access_secret) { frm.add_custom_button(__("Take Backup Now"), function(frm){ frappe.call({ - method: "frappe.integrations.dropbox_integration.take_backup", + method: "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backup", freeze: true }) }).addClass("btn-primary") From bebf211ed864f12b6a13cc3060aaafd3ad887813 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 31 Oct 2016 12:31:09 +0530 Subject: [PATCH 3/4] [ui] z-index fix --- frappe/public/css/form_grid.css | 1 + frappe/public/css/list.css | 3 +++ frappe/public/less/form_grid.less | 1 + frappe/public/less/list.less | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/frappe/public/css/form_grid.css b/frappe/public/css/form_grid.css index c38c3c557f..2d6ee44553 100644 --- a/frappe/public/css/form_grid.css +++ b/frappe/public/css/form_grid.css @@ -147,6 +147,7 @@ } .grid-row .frappe-control { margin-bottom: 0px; + position: relative; } .grid-row .col-sm-6 .editor-toolbar-text-group, .grid-row .col-sm-6 .editor-toolbar-align-group { diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index c4eaff5d7a..d319b79040 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -65,6 +65,9 @@ .filter_field { width: 65% !important; } + .filter_field .frappe-control { + position: relative; + } } .list-row { padding: 9px 15px; diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less index 654a0a39d7..b1a55dd948 100644 --- a/frappe/public/less/form_grid.less +++ b/frappe/public/less/form_grid.less @@ -197,6 +197,7 @@ .frappe-control { margin-bottom: 0px; + position: relative; } .col-sm-6 { diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index ed396f2355..7d00c7792b 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -84,6 +84,10 @@ .filter_field { width: 65% !important; + + .frappe-control { + position: relative; + } } } From e68c2658e75ee6a5d7a21e2f181ece303111bdad Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 31 Oct 2016 15:35:36 +0600 Subject: [PATCH 4/4] bumped to version 7.1.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 4b6d130b52..e88b3ff0b2 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '7.1.2' +__version__ = '7.1.3' __title__ = "Frappe Framework" local = Local()