luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Frontend: Fix for refresh after page change

Browse source
This commit is contained in:
Michael Mayer 2019-06-09 08:54:57 +02:00
parent f47d93be7f
commit a354e24f2a
2 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frontend/src/pages/labels.vue
View file

@ -2,7 +2,7 @@
<div class="p-page p-page-labels" v-infinite-scroll="loadMore" :infinite-scroll-disabled="scrollDisabled"
:infinite-scroll-distance="10" :infinite-scroll-listen-for-event="'scrollRefresh'">
<v-form ref="form" class="p-labels-search" lazy-validation @submit.prevent="search" dense>
<v-form ref="form" class="p-labels-search" lazy-validation @submit.prevent="updateQuery" dense>
<v-toolbar flat color="blue-grey lighten-4">
<v-text-field class="pt-3 pr-3"
single-line
@ -12,7 +12,7 @@
color="blue-grey"
@click:clear="clearQuery"
v-model="filter.q"
@keyup.enter.native="search"
@keyup.enter.native="updateQuery"
id="search"
></v-text-field>
@ -90,8 +90,19 @@
props: {
staticFilter: Object
},
watch: {
'$route' () {
const query = this.$route.query;
this.filter.q = query['q'];
this.lastFilter = {};
this.routeName = this.$route.name;
this.search();
}
},
data() {
const query = this.$route.query;
const routeName = this.$route.name;
const q = query['q'] ? query['q'] : '';
const filter = {q: q};
const settings = {};
@ -105,6 +116,7 @@
settings: settings,
filter: filter,
lastFilter: {},
routeName: routeName,
};
},
methods: {
@ -147,6 +159,12 @@
Object.assign(query, this.filter);
for (let key in query) {
if (query[key] === undefined || !query[key]) {
delete query[key];
}
}
this.$router.replace({query: query});
},
searchParams() {
@ -176,8 +194,6 @@
this.offset = 0;
this.updateQuery();
const params = this.searchParams();
Label.search(params).then(response => {

16
frontend/src/pages/photos.vue
View file

@ -2,7 +2,7 @@
<div class="p-page p-page-photos" v-infinite-scroll="loadMore" :infinite-scroll-disabled="scrollDisabled"
:infinite-scroll-distance="10" :infinite-scroll-listen-for-event="'scrollRefresh'">
<p-photo-search :settings="settings" :filter="filter" :filter-change="search"
<p-photo-search :settings="settings" :filter="filter" :filter-change="updateQuery"
:settings-change="updateQuery"></p-photo-search>
<v-container fluid>
@ -29,13 +29,11 @@
},
watch: {
'$route' () {
if(this.routeName === this.$route.name) {
return;
}
const query = this.$route.query;
this.filter.q = query['q'];
this.filter.camera = query['camera'] ? parseInt(query['camera']) : 0;
this.filter.country = query['country'] ? query['country'] : '';
this.lastFilter = {};
this.routeName = this.$route.name;
this.search();
@ -131,6 +129,12 @@
Object.assign(query, this.filter);
for (let key in query) {
if (query[key] === undefined || !query[key]) {
delete query[key];
}
}
this.$router.replace({query: query});
},
searchParams() {
@ -160,8 +164,6 @@
this.offset = 0;
this.updateQuery();
const params = this.searchParams();
Photo.search(params).then(response => {