Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit da059b5

Browse files
authored
Merge pull request #1863 from OpenBazaar/fixStoreWizardSearch
Fixes the moderator search in the store wizard
2 parents 9a5efeb + beb8bd0 commit da059b5

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

js/templates/storeWizard.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@
8585
<%= polyglot.t('StoreModeratorsOptional') %>
8686
<span class="textOpacity75 fontSize14 floatRight"><%= polyglot.t('pageXofY', {currentPage: 2, totalPages: 2}) %></span>
8787
</div>
88-
<div class="flexContainer flex-border homeModal-settings homeModal-settings-noSearch scrollOverflow custCol-primary customThemeScrollbar">
88+
<div id="modSearch" class="flexContainer flex-border homeModal-settings homeModal-settings-noSearch scrollOverflow custCol-primary customThemeScrollbar">
8989
<div class="flexRow">
9090
<div class="txtFieldWrapper txtFieldWrapper-bar searchWrapper custCol-primary custCol-border">
9191
<input type="text" class="txtField txtField-bar search" placeholder="<%= polyglot.t('Searchformoderators') %>" />
9292
</div>
9393
</div>
94-
<div class="flexRow js-storeWizardModeratorList">
94+
<div class="flexRow list js-storeWizardModeratorList">
9595
</div>
9696
</div>
9797
<div class="bar barFlush custCol-secondary borderBottomLeftRaidus3 borderBottomRightRaidus3 custCol-text">

js/templates/userShort.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</div>
7171
<div class="marginLeft15 marginRight15 marginTop2 <% if(ob.micro){ %>textSize10<% }else{ %>fontSize14<% } %> txt-fade textWeightNormal">
7272
<% if(ob.short_description) { %>
73-
<div class="clamp2"><%= ob.short_description %></div>
73+
<div class="clamp2 js-userDescription"><%= ob.short_description %></div>
7474
<% } else { %>
7575
<div><%= polyglot.t('NoDescriptionAdded') %></div>
7676
<% } %>

js/views/storeWizardVw.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,15 @@ module.exports = baseModal.extend({
144144

145145
handleSocketMessage: function(response) {
146146
var data = JSON.parse(response.data);
147+
147148
if (data.id == this.socketModeratorID && data.moderator.guid != this.model.get('user').guid && this.model.get('user').blocked_guids.indexOf(data.moderator.guid) == -1){
148149
this.renderModerator(data.moderator);
149150
}
150151
},
151152

152153
renderModerator: function(moderator){
154+
const searchOptions = {valueNames: ['js-searchName', 'js-userDescription'], page: 1000};
155+
153156
//make sure this moderator is not a duplicate
154157
if (this.shownMods.indexOf(moderator.guid) > -1){
155158
return;
@@ -168,6 +171,13 @@ module.exports = baseModal.extend({
168171

169172
this.$el.find('.js-storeWizardModeratorList').append(modShort.el);
170173
this.moderatorCount++;
174+
175+
// create or update the search
176+
if (!this.modSearch) {
177+
this.modSearch = new window.List('modSearch', searchOptions);
178+
} else {
179+
this.modSearch.reIndex();
180+
}
171181
},
172182

173183
blockClicks: function(e) {

0 commit comments

Comments
 (0)