Revert "Changes associated with #2026"

This reverts commit 0090088cb3.
This commit is contained in:
Aman Budgujar
2023-03-03 10:48:34 +05:30
parent 5c27dca3d7
commit 7d0891f9f6
4 changed files with 1 additions and 31 deletions

View File

@@ -13,13 +13,12 @@
[formGroup]="formGroup" [formGroup]="formGroup"
[formLayout]="formLayout" [formLayout]="formLayout"
[displayCancel]="false" [displayCancel]="false"
[submitLabel]="submitLabel"
(submitForm)="onSubmit()"> (submitForm)="onSubmit()">
<div before class="btn-group"> <div before class="btn-group">
<button (click)="onCancel()" <button (click)="onCancel()"
class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button> class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
</div> </div>
<div *ngIf="displayResetPassword" between class="btn-group"> <div between class="btn-group">
<button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()"> <button class="btn btn-primary" [disabled]="!(canReset$ | async)" (click)="resetPassword()">
<i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}} <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
</button> </button>

View File

@@ -164,16 +164,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
* Whether or not this EPerson is currently being impersonated * Whether or not this EPerson is currently being impersonated
*/ */
isImpersonated = false; isImpersonated = false;
/**
* A boolean that indicate if to display EPersonForm's Rest password button
*/
displayResetPassword = false;
/**
* A string that indicate the label of Submit button
*/
submitLabel = 'form.create';
/** /**
* Subscription to email field value change * Subscription to email field value change
@@ -198,8 +188,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
this.epersonInitial = eperson; this.epersonInitial = eperson;
if (hasValue(eperson)) { if (hasValue(eperson)) {
this.isImpersonated = this.authService.isImpersonatingUser(eperson.id); this.isImpersonated = this.authService.isImpersonatingUser(eperson.id);
this.displayResetPassword = true;
this.submitLabel = 'form.submit';
} }
})); }));
} }

View File

@@ -14,8 +14,6 @@
<tr class="text-center"> <tr class="text-center">
<th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th> <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
<th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th> <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
<th *ngIf="isListOfEPerson">{{'resource-policies.form.eperson-group-list.table.headers.identity' | translate}}</th>
<th *ngIf="!isListOfEPerson">{{'resource-policies.form.eperson-group-list.table.headers.collcomm' | translate}}</th>
<th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th> <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
</tr> </tr>
</thead> </thead>
@@ -24,11 +22,6 @@
[class.table-primary]="isSelected(entry) | async"> [class.table-primary]="isSelected(entry) | async">
<td>{{entry.id}}</td> <td>{{entry.id}}</td>
<td>{{dsoNameService.getName(entry)}}</td> <td>{{dsoNameService.getName(entry)}}</td>
<td *ngIf="isListOfEPerson">
{{'resource-policies.form.eperson-group-list.cell.email' | translate}} {{entry.email}}<br/>
{{'resource-policies.form.eperson-group-list.cell.netid' | translate}} {{entry.netid}}
</td>
<td *ngIf="!isListOfEPerson">{{(entry.object | async)?.payload?.name}}</td>
<td class="text-center"> <td class="text-center">
<button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)"> <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
{{'resource-policies.form.eperson-group-list.select.btn' | translate}} {{'resource-policies.form.eperson-group-list.select.btn' | translate}}

View File

@@ -1751,8 +1751,6 @@
"form.submit": "Save", "form.submit": "Save",
"form.create": "Create",
"form.repeatable.sort.tip": "Drop the item in the new position", "form.repeatable.sort.tip": "Drop the item in the new position",
@@ -3661,10 +3659,6 @@
"resource-policies.form.eperson-group-list.table.headers.name": "Name", "resource-policies.form.eperson-group-list.table.headers.name": "Name",
"resource-policies.form.eperson-group-list.table.headers.collcomm": "Collection/Community",
"resource-policies.form.eperson-group-list.table.headers.identity": "Identity",
"resource-policies.form.eperson-group-list.modal.header": "Cannot change type", "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
"resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.", "resource-policies.form.eperson-group-list.modal.text1.toGroup": "It is not possible to replace an ePerson with a group.",
@@ -3675,10 +3669,6 @@
"resource-policies.form.eperson-group-list.modal.close": "Ok", "resource-policies.form.eperson-group-list.modal.close": "Ok",
"resource-policies.form.eperson-group-list.cell.email": "Email: ",
"resource-policies.form.eperson-group-list.cell.netid": "NetID: ",
"resource-policies.form.date.end.label": "End Date", "resource-policies.form.date.end.label": "End Date",
"resource-policies.form.date.start.label": "Start Date", "resource-policies.form.date.start.label": "Start Date",