Browse Source

setup integration service patch fixed (#2310)

version-14
Nabin Hait 8 years ago
committed by Rushabh Mehta
parent
commit
90e63cae6d
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      frappe/patches/v7_1/setup_integration_services.py

+ 5
- 1
frappe/patches/v7_1/setup_integration_services.py View File

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.exceptions import DataError from frappe.exceptions import DataError
from frappe.utils.password import get_decrypted_password from frappe.utils.password import get_decrypted_password
from frappe.utils import cstr


app_list = [ app_list = [
{"app_name": "razorpay_integration", "service_name": "Razorpay", "doctype": "Razorpay Settings", "remove": True}, {"app_name": "razorpay_integration", "service_name": "Razorpay", "doctype": "Razorpay Settings", "remove": True},
@@ -55,7 +56,7 @@ def get_app_settings(app_details):


for d in controller.fields: for d in controller.fields:
if settings.get(d.fieldname): if settings.get(d.fieldname):
if ''.join(set(settings.get(d.fieldname))) == '*':
if ''.join(set(cstr(settings.get(d.fieldname)))) == '*':
setattr(settings, d.fieldname, get_decrypted_password(doctype, docname, d.fieldname, raise_exception=True)) setattr(settings, d.fieldname, get_decrypted_password(doctype, docname, d.fieldname, raise_exception=True))


parameters.update({d.fieldname : settings.get(d.fieldname)}) parameters.update({d.fieldname : settings.get(d.fieldname)})
@@ -85,6 +86,9 @@ def get_parameters(app_details):
elif app_details["service_name"] == "Dropbox": elif app_details["service_name"] == "Dropbox":
doc = frappe.db.get_value(app_details["doctype"], None, doc = frappe.db.get_value(app_details["doctype"], None,
["dropbox_access_key", "dropbox_access_secret", "upload_backups_to_dropbox"], as_dict=1) ["dropbox_access_key", "dropbox_access_secret", "upload_backups_to_dropbox"], as_dict=1)
if not doc:
return


if not (frappe.conf.dropbox_access_key and frappe.conf.dropbox_secret_key): if not (frappe.conf.dropbox_access_key and frappe.conf.dropbox_secret_key):
return return


Loading…
Cancel
Save