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

Merge with upstream

Browse Source
This commit is contained in:
Faris Ansari 2018-08-21 19:17:25 +05:30
commit a22aa60a17
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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)
}
);
this.edit_profile_dialog.set_df_property('company_email', 'read_only', 1);
}
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_dict = {};
this.cache = erpnext.hub.cache.items_to_publish;
this.cache = [];
frappe.realtime.on("items-sync", (data) => {
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) {
// Add item additional data
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"));
});
// Retrieve item data
const items_data_to_publish = item_codes_to_publish.map(item_code => this.items_data_to_publish[item_code])
return frappe.call(

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

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