house keeping
This commit is contained in:
parent
38dc4d9842
commit
8e11d984a2
|
@ -148,7 +148,6 @@ export default {
|
||||||
'column_order': this.columns_order[this.active_column]}
|
'column_order': this.columns_order[this.active_column]}
|
||||||
this.setSites(payload)
|
this.setSites(payload)
|
||||||
if (this.url_search_text) {
|
if (this.url_search_text) {
|
||||||
console.log('searchig for hash text: '+this.url_search_text)
|
|
||||||
this.setSearchText(this.url_search_text)
|
this.setSearchText(this.url_search_text)
|
||||||
this.siteSearch()
|
this.siteSearch()
|
||||||
}
|
}
|
||||||
|
@ -169,7 +168,6 @@ export default {
|
||||||
return this.columns_order[name] == 'asc' ? faLongArrowAltUp : faLongArrowAltDown
|
return this.columns_order[name] == 'asc' ? faLongArrowAltUp : faLongArrowAltDown
|
||||||
},
|
},
|
||||||
loadMoreSites() {
|
loadMoreSites() {
|
||||||
console.log('loading')
|
|
||||||
this.incrementPageCount()
|
this.incrementPageCount()
|
||||||
},
|
},
|
||||||
...mapGetters([
|
...mapGetters([
|
||||||
|
|
|
@ -54,7 +54,6 @@ const store = new Vuex.Store({
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
setSites(context, payload) {
|
setSites(context, payload) {
|
||||||
//state.sites = _.sortBy(payload.sites, payload.column_name)
|
|
||||||
context.state.sites = payload.sites
|
context.state.sites = payload.sites
|
||||||
context.commit("setColumnOrder", {'active_column': payload.active_column,
|
context.commit("setColumnOrder", {'active_column': payload.active_column,
|
||||||
'column_order': payload.column_order})
|
'column_order': payload.column_order})
|
||||||
|
@ -64,16 +63,10 @@ const store = new Vuex.Store({
|
||||||
var api_endpoint = '/api/collections/search?fulltext_search='
|
var api_endpoint = '/api/collections/search?fulltext_search='
|
||||||
axios.post(api_endpoint + context.getters.getSearchText, {})
|
axios.post(api_endpoint + context.getters.getSearchText, {})
|
||||||
.then(function (response) {
|
.then(function (response) {
|
||||||
console.log("remote")
|
|
||||||
console.log(response.data)
|
|
||||||
var local_search_result = context.getters.searchLocalSiteData
|
var local_search_result = context.getters.searchLocalSiteData
|
||||||
console.log("local")
|
|
||||||
console.log(local_search_result)
|
|
||||||
var merged_results = Object.assign({},
|
var merged_results = Object.assign({},
|
||||||
local_search_result,
|
local_search_result,
|
||||||
response.data)
|
response.data)
|
||||||
console.log("merged")
|
|
||||||
console.log(merged_results)
|
|
||||||
context.commit("setFilteredSites", merged_results)
|
context.commit("setFilteredSites", merged_results)
|
||||||
context.commit("setColumnOrder", {'active_column': context.state.active_column,
|
context.commit("setColumnOrder", {'active_column': context.state.active_column,
|
||||||
'column_order': context.state.column_order})
|
'column_order': context.state.column_order})
|
||||||
|
|
Loading…
Reference in New Issue