Merge pull request #138 from Breeding-Insight/feature/BI-1157

[BI-1157] Allow for imports to not be connected to a program
Breeding-Insight · Oct 29, 2021 · b3bde35 · b3bde35
2 parents e6e6f4c + c611ef8
commit b3bde35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/breeding-insight/service/ImportService.ts b/src/breeding-insight/service/ImportService.ts
@@ -50,7 +50,7 @@ export class ImportService {
       return importMapping;
     } catch (e) {
       if (e.response && e.response.status === 409) {
-        e.errorMessage = this.mappingNameExists;
+        e.errorMessage = e.response.statusText;
       } else {
         e.errorMessage = e.response.statusText;
       }

diff --git a/src/views/import/BrAPIImporter.vue b/src/views/import/BrAPIImporter.vue
@@ -96,7 +96,7 @@
         </template>
         <BasicInputField
           v-bind:field-name="'Import Mapping Name'"
-          v-bind:field-help="'This is the name of the import mapping users will start when importing a file'"
+          v-bind:field-help="'This is the name of the import mapping users will start when importing a file. Reserved import names: Germplasm.'"
           v-bind:value="mapping.name"
           v-on:input="mapping.name = $event"
         />