Small adjustments to prevent errors

Related to #416.
gbv · Jun 11, 2019 · 3f15704 · 3f15704
1 parent ccf8dad
commit 3f15704
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -462,7 +462,8 @@ export default {
           this.$store.dispatch("auth/init", this.config.auth)
         }
         // Look up local mappings count and show warning if there are too many.
-        this.getMappings({ registry: "http://coli-conc.gbv.de/registry/local-mappings", limit: 1 }).then(mappings => {
+        // Note: Do not use this.getMappings here because it leads to issues when schemes are not loaded yet.
+        this.$store.dispatch({ type: "mapping/getMappings", registry: "http://coli-conc.gbv.de/registry/local-mappings", limit: 1 }).then(mappings => {
           if (mappings.totalCount && mappings.totalCount >= 500) {
             this.alert(this.$t("general.tooManyMappings", { count: mappings.totalCount }), 0)
           }

diff --git a/src/mixins/objects.js b/src/mixins/objects.js
@@ -161,7 +161,7 @@ export default {
         this.adjustConcept(object)
 
         // Provider adjustments
-        let provider = _.get(this._getObject(_.get(object, "inScheme[0]")), "_provider", options.provider)
+        let provider = _.get(object, "_provider") || _.get(this._getObject(_.get(object, "inScheme[0]")), "_provider") || options.provider
         if (provider) {
           if (type == "scheme") {
             provider.adjustSchemes([object])