[hub] set first user's password in marketplace users
diff --git a/erpnext/hub_node/doctype/hub_user/hub_user.json b/erpnext/hub_node/doctype/hub_user/hub_user.json
index f72f01d..4e4deff 100644
--- a/erpnext/hub_node/doctype/hub_user/hub_user.json
+++ b/erpnext/hub_node/doctype/hub_user/hub_user.json
@@ -53,7 +53,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "hub_username",
+ "fieldname": "username",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -85,7 +85,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "hub_password",
+ "fieldname": "password",
"fieldtype": "Password",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -121,8 +121,8 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2018-08-31 13:58:46.098710",
- "modified_by": "Administrator",
+ "modified": "2018-08-31 20:39:55.944828",
+ "modified_by": "cave@aperture.com",
"module": "Hub Node",
"name": "Hub User",
"name_case": "",
diff --git a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py
index 909ed99..6dcbd13 100644
--- a/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py
+++ b/erpnext/hub_node/doctype/marketplace_settings/marketplace_settings.py
@@ -44,8 +44,8 @@
frappe.throw(json.loads(response.text))
if message.get('email'):
- self.update_session_user_password(message)
self.registered = 1
+ self.users[0].password = message.get('password')
self.save()
return message or None
@@ -63,10 +63,6 @@
# self.enabled = 0
# self.save()
- def update_session_user_password(self, message):
- # TODO: Update child table session user password
- pass
-
def create_hub_connector(self, message):
if frappe.db.exists('Data Migration Connector', 'Hub Connector'):
hub_connector = frappe.get_doc('Data Migration Connector', 'Hub Connector')
diff --git a/erpnext/public/js/hub/components/profile_dialog.js b/erpnext/public/js/hub/components/profile_dialog.js
index 36672b9..03e7f48 100644
--- a/erpnext/public/js/hub/components/profile_dialog.js
+++ b/erpnext/public/js/hub/components/profile_dialog.js
@@ -19,8 +19,7 @@
.then(company => {
dialog.set_values({
country: company.country,
- currency: company.default_currency,
- company_email: company.email
+ currency: company.default_currency
});
});
}
@@ -28,8 +27,8 @@
},
{
fieldname: 'company_email',
- label: __('Company Email'),
- fieldtype: 'Data'
+ label: __('Email'),
+ fieldtype: 'Read Only'
},
{
fieldname: 'users',
@@ -81,8 +80,6 @@
dialog.fields_dict.users.set_data(users);
});
- dialog.set_values(initial_values);
-
// Post create
const default_company = frappe.defaults.get_default('company');
dialog.set_value('company', default_company);
diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js
index e062c6a..7659a36 100644
--- a/erpnext/public/js/hub/marketplace.js
+++ b/erpnext/public/js/hub/marketplace.js
@@ -101,7 +101,7 @@
register_seller(form_values) {
frappe.call({
- method: 'erpnext.hub_node.doctype.hub_settings.hub_settings.register_seller',
+ method: 'erpnext.hub_node.doctype.marketplace_settings.marketplace_settings.register_seller',
args: form_values
}).then(() => {
this.register_dialog.hide();