tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removes conflict message

This commit is contained in:
weryques 2018-07-04 17:01:47 -03:00
parent 8f2a019eec
commit ff411072de
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/js/event-bus-search.js
View File

@ -53,13 +53,8 @@ export default {
// Should set Collection ID from URL only when in admin. // Should set Collection ID from URL only when in admin.
if (this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage') if (this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage')
this.collectionId = !this.$route.params.collectionId ? this.$route.params.collectionId : parseInt(this.$route.params.collectionId); this.collectionId = !this.$route.params.collectionId ? this.$route.params.collectionId : parseInt(this.$route.params.collectionId);
<<<<<<< HEAD
// Fills the URL with appropriate default values in case a query is not passed // Fills the URL with appropriate default values in case a query is not passed
=======
// Fills the URL with apropriate default values in case a query is not passed
>>>>>>> Fixes infinite loop after transiting to advanced search page. Implements Filter Tags (on tests), except for tag inputs, which still present issues on removing values.
if (this.$route.name == null || this.$route.name == undefined || this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage') { if (this.$route.name == null || this.$route.name == undefined || this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage') {
// Items Per Page // Items Per Page