diff --git a/package.json b/package.json index c36a030e0..d37a6516a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bi-web", - "version": "v1.4.0", + "version": "v1.5.0+999", "private": true, "scripts": { "build": "node $npm_package_config_task_path/build.js --dev-audit-level=critical --prod-audit-level=none", @@ -96,5 +96,5 @@ "vue-cli-plugin-axios": "0.0.4", "vue-template-compiler": "^2.7.14" }, - "versionInfo": "https://github.com/Breeding-Insight/bi-web/releases/tag/v1.4.0" + "versionInfo": "https://github.com/Breeding-Insight/bi-web/commit/f1b555d0e86e9d66dca773b6e8b68de770a1975f" } diff --git a/src/components/layouts/Footer.vue b/src/components/layouts/Footer.vue index db1c558fc..59b4fd813 100644 --- a/src/components/layouts/Footer.vue +++ b/src/components/layouts/Footer.vue @@ -51,6 +51,7 @@
+
+
diff --git a/src/components/program/ProgramUsersTable.vue b/src/components/program/ProgramUsersTable.vue index 05a9d512d..1eca34ea2 100644 --- a/src/components/program/ProgramUsersTable.vue +++ b/src/components/program/ProgramUsersTable.vue @@ -115,6 +115,7 @@ v-bind:archivable="$ability.can('archive', 'ProgramUser')" v-bind:pagination="paginationController" v-bind:data-form-state="editUserFormState" + v-bind:deactivate-link-text="removeUserLinkText" v-on:submit="updateUser($event)" v-on:remove="displayWarning($event)" v-on:show-error-notification="$emit('show-error-notification', $event)" @@ -155,7 +156,7 @@ You can add a user to your program from this panel. When you remove a user from your program, their account and membership in other programs is not affected.

-

You can add, edit, and delete users from your program from this panel.

+

You can add, edit, and remove users from your program from this panel.

@@ -241,6 +242,8 @@ export default class ProgramUsersTable extends Vue { private programUserSort!: UserSort; private updateSort!: (sort: UserSort) => void; + private removeUserLinkText: string = "Remove Access"; + newUserValidations = { name: {required}, email: {required, email}, @@ -431,7 +434,7 @@ export default class ProgramUsersTable extends Vue { if (user){ this.deleteUser = user; - this.deactivateWarningTitle = "Deactivate " + user.name + " from program " + this.activeProgram!.name + "?"; + this.deactivateWarningTitle = "Remove " + user.name + " from program " + this.activeProgram!.name + "?"; this.deactivateActive = true; } else { Vue.$log.error('Could not find object to delete')