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

Merge branch 'hub-redesign' of https://github.com/netchampfaris/erpnext into hub-redesign

Browse Source
This commit is contained in:
Faris Ansari 2018-07-27 21:51:31 +05:30
commit 19d40cafba
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/public/js/hub/marketplace.js
View File

@ -137,7 +137,7 @@ erpnext.hub.Marketplace = class Marketplace {
this.subpages.favourites = new erpnext.hub.Favourites(this.$body); this.subpages.favourites = new erpnext.hub.Favourites(this.$body);
} }
if (route[1] === 'search' && route[2] && !this.subpages.search) { if (route[1] === 'search' && !this.subpages.search) {
this.subpages.search = new erpnext.hub.SearchPage(this.$body); this.subpages.search = new erpnext.hub.SearchPage(this.$body);
} }
@ -303,9 +303,8 @@ erpnext.hub.SearchPage = class SearchPage extends SubPage {
} }
refresh() { refresh() {
this.keyword = frappe.get_route()[2]; this.keyword = frappe.get_route()[2] || '';
this.$wrapper.find('input').val(this.keyword); this.$wrapper.find('input').val(this.keyword);
if (!this.keyword) return;
this.get_items_by_keyword(this.keyword) this.get_items_by_keyword(this.keyword)
.then(items => this.render(items)); .then(items => this.render(items));
@ -317,7 +316,8 @@ erpnext.hub.SearchPage = class SearchPage extends SubPage {
render(items) { render(items) {
this.$wrapper.find('.hub-card-container').remove(); this.$wrapper.find('.hub-card-container').remove();
const html = get_item_card_container_html(items, __('Search results for "{0}"', [this.keyword])); const title = this.keyword ? __('Search results for "{0}"', [this.keyword]) : '';
const html = get_item_card_container_html(items, title);
this.$wrapper.append(html); this.$wrapper.append(html);
} }
} }
@ -841,11 +841,14 @@ function get_empty_state(message, action) {
function get_item_card_container_html(items, title='') { function get_item_card_container_html(items, title='') {
const items_html = (items || []).map(item => get_item_card_html(item)).join(''); const items_html = (items || []).map(item => get_item_card_html(item)).join('');
const title_html = title
? `<div class="col-sm-12 margin-bottom">
<b>${title}</b>
</div>`
: '';
const html = `<div class="row hub-card-container"> const html = `<div class="row hub-card-container">
<div class="col-sm-12 margin-bottom"> ${title_html}
<b>${title}</b>
</div>
${items_html} ${items_html}
</div>`; </div>`;