Merge pull request #2092 from CrisGuzmanS/issues/1186-470750

Buttons have same name but different actions.
This commit is contained in:
Tim Donohue
2023-03-01 14:14:54 -06:00
committed by GitHub
2 changed files with 5 additions and 2 deletions

View File

@@ -2,18 +2,21 @@
<button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn" <button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}" ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
[attr.aria-label]="'submission.workspace.generic.view-help' | translate"
[routerLink]="[getWorkspaceItemViewRoute(object)]"> [routerLink]="[getWorkspaceItemViewRoute(object)]">
<i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}} <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
</button> </button>
<a class="btn btn-primary mt-1 mb-3" id="{{'edit_' + object.id}}" <a class="btn btn-primary mt-1 mb-3" id="{{'edit_' + object.id}}"
ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}" ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
[attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
[routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button"> [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
<i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}} <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
</a> </a>
<button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3" <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}" ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
[attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
(click)="$event.preventDefault();confirmDiscard(content)"> (click)="$event.preventDefault();confirmDiscard(content)">
<span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i> <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
{{'submission.workflow.tasks.generic.processing' | translate}}</span> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
@@ -39,4 +42,4 @@
<button type="button" id="delete_confirm" class="btn btn-danger" <button type="button" id="delete_confirm" class="btn btn-danger"
(click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button> (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
</div> </div>
</ng-template> </ng-template>

View File

@@ -4694,7 +4694,7 @@
"submission.workflow.generic.delete": "Delete", "submission.workflow.generic.delete": "Delete",
"submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\". You will then be asked to confirm it.", "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
"submission.workflow.generic.edit": "Edit", "submission.workflow.generic.edit": "Edit",