Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hub] profile email uneditable, style additions, base64 sync enable

Browse Source
This commit is contained in:
Prateeksha Singh 2018-08-21 17:43:30 +05:30
parent d17aedb719
commit b0a3a106fc
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/hub_node/data_migration_mapping/item_to_hub_item/__init__.py
View File

@ -2,18 +2,18 @@ import frappe, io, base64, urllib, os
def pre_process(doc): def pre_process(doc):
# file_path = doc.image file_path = doc.image
# file_name = os.path.basename(file_path) file_name = os.path.basename(file_path)
# if file_path.startswith('http'): if file_path.startswith('http'):
# url = file_path url = file_path
# file_path = os.path.join('/tmp', file_name) file_path = os.path.join('/tmp', file_name)
# urllib.urlretrieve(url, file_path) urllib.urlretrieve(url, file_path)
# with io.open(file_path, 'rb') as f: with io.open(file_path, 'rb') as f:
# doc.image = base64.b64encode(f.read()) doc.image = base64.b64encode(f.read())
# doc.image_file_name = file_name doc.image_file_name = file_name
cached_details = frappe.get_doc('Hub Tracked Item', doc.item_code) cached_details = frappe.get_doc('Hub Tracked Item', doc.item_code)

2
erpnext/public/js/hub/pages/profile.js
View File

@ -102,6 +102,8 @@ erpnext.hub.Profile = class Profile extends SubPage {
on_submit: this.update_profile.bind(this) on_submit: this.update_profile.bind(this)
} }
); );
this.edit_profile_dialog.set_df_property('company_email', 'read_only', 1);
} }
edit_profile() { edit_profile() {

5
erpnext/public/js/hub/pages/publish.js
View File

@ -13,9 +13,6 @@ erpnext.hub.Publish = class Publish extends SubPage {
this.fetched_items = []; this.fetched_items = [];
this.fetched_items_dict = {}; this.fetched_items_dict = {};
this.cache = erpnext.hub.cache.items_to_publish;
this.cache = [];
frappe.realtime.on("items-sync", (data) => { frappe.realtime.on("items-sync", (data) => {
this.$wrapper.find('.progress-bar').css('width', data.progress_percent+'%'); this.$wrapper.find('.progress-bar').css('width', data.progress_percent+'%');
@ -110,6 +107,7 @@ erpnext.hub.Publish = class Publish extends SubPage {
} }
update_items_data_to_publish(values) { update_items_data_to_publish(values) {
// Add item additional data
this.items_data_to_publish[values.item_code] = values; this.items_data_to_publish[values.item_code] = values;
} }
@ -249,6 +247,7 @@ erpnext.hub.Publish = class Publish extends SubPage {
item_codes_to_publish.push($(this).attr("data-id")); item_codes_to_publish.push($(this).attr("data-id"));
}); });
// Retrieve item data
const items_data_to_publish = item_codes_to_publish.map(item_code => this.items_data_to_publish[item_code]) const items_data_to_publish = item_codes_to_publish.map(item_code => this.items_data_to_publish[item_code])
return frappe.call( return frappe.call(

4
erpnext/public/less/hub.less
View File

@ -50,6 +50,7 @@ body[data-route^="marketplace/"] {
margin-top: 0px; margin-top: 0px;
margin-bottom: 15px; margin-bottom: 15px;
background-color: #f9fbf7; background-color: #f9fbf7;
border-radius: 4px;
justify-content: space-between; justify-content: space-between;
} }
@ -131,6 +132,8 @@ body[data-route^="marketplace/"] {
.hub-card-overlay-button { .hub-card-overlay-button {
position: absolute; position: absolute;
right: 15px;
bottom: 15px;
} }
.hub-card-image { .hub-card-image {
@ -215,6 +218,7 @@ body[data-route^="marketplace/"] {
height: 80px; height: 80px;
border-radius: 4px; border-radius: 4px;
border: 1px solid @border-color; border: 1px solid @border-color;
border-style: dashed;
margin: 15px 0px; margin: 15px 0px;
} }