Merge branch 'hub-redesign' of https://github.com/frappe/erpnext into hub-redesign
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.js b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
index 03314bb..089f499 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.js
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.js
@@ -1,35 +1,3 @@
frappe.ui.form.on("Hub Settings", {
- onload_post_render: function(frm) {
- if(frm.get_field("unregister_from_hub").$input)
- frm.get_field("unregister_from_hub").$input.addClass("btn-danger");
- },
-
- hub_user_email: function(frm) {
- if(frm.doc.hub_user_email){
- frm.set_value("hub_user_name", frappe.user.full_name(frm.doc.hub_user_email));
- }
- },
-
- call_register: (frm) => {
- this.frm.call({
- doc: this.frm.doc,
- method: "register",
- args: {},
- freeze: true,
- callback: function(r) {},
- onerror: function() {
- frappe.msgprint(__("Wrong Password"));
- frm.set_value("enabled", 0);
- }
- });
- },
-
- unregister_from_hub: (frm) => {
- frappe.verify_password(() => {
- var d = frappe.confirm(__('Are you sure you want to unregister?'), () => {
- frm.call('unregister');
- }, () => {}, __('Confirm Action'));
- d.get_primary_btn().addClass("btn-danger");
- });
- },
+ onload_post_render: function() {},
});
diff --git a/erpnext/public/js/hub/pages/Publish.vue b/erpnext/public/js/hub/pages/Publish.vue
index 79da6cb..0219fc9 100644
--- a/erpnext/public/js/hub/pages/Publish.vue
+++ b/erpnext/public/js/hub/pages/Publish.vue
@@ -72,13 +72,11 @@
item_id_fieldname: 'item_code',
// Constants
+ // TODO: multiline translations don't work
page_title: __('Publish Products'),
search_placeholder: __('Search Items ...'),
- empty_state_message: __(`No Items selected yet.
- Browse and click on products below to publish.`),
- valid_products_instruction: __(`Only products with an image, description
- and category can be published. Please update them if an item in your
- inventory does not appear.`),
+ empty_state_message: __(`No Items selected yet. Browse and click on products below to publish.`),
+ valid_products_instruction: __(`Only products with an image and description can be published. Please update them if an item in your inventory does not appear.`),
last_sync_message: (hub.settings.last_sync_datetime)
? __(`Last sync was
<a href="#marketplace/profile">