inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-4124] Change name displayed for groups in Add Permission Panel Component (#6305)

Browse Source 
* [ACA-4124] Change property displayd for groups in Add Permission Panel Component

* [ACA-4124] Add 503 localization

* Fix e2e test

* Fix e2e test
This commit is contained in:
davidcanonieto 2020-11-10 10:18:59 +00:00 committed by GitHub
parent 53dcccd7cb
commit 973b58f420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
demo-shell/src/app/components/error/demo-error.component.html
View File

@ -1,15 +1,22 @@
<div fxLayout="column" fxLayoutAlign="center center"> <div fxLayout="column"
fxLayoutAlign="center center">
<adf-error-content [errorCode]="errorCode"> <adf-error-content [errorCode]="errorCode">
<div adf-error-content-actions class="app-error-content-buttons"> <div adf-error-content-actions
<a a id="adf-secondary-button" mat-raised-button color="primary" class="app-error-content-buttons">
(click)="onReportIssue()" <a *ngIf="'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate"
class="app-error-content-description-link"> id="adf-secondary-button"
mat-raised-button
color="primary"
(click)="onReportIssue()"
class="app-error-content-description-link">
{{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }} {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
</a> </a>
<a id="adf-return-button" mat-raised-button color="primary" (click)="onReturnButton()"> <a id="adf-return-button"
mat-raised-button
color="primary"
(click)="onReturnButton()">
{{ 'ERROR_CONTENT.' + errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }} {{ 'ERROR_CONTENT.' + errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }}
</a> </a>
</div> </div>
</adf-error-content> </adf-error-content>
</div> </div>

6
e2e/content-services/permissions/permissions-component.e2e.ts
View File

@ -227,9 +227,9 @@ describe('Permissions Component', () => {
await permissionsPage.addPermissionsDialog.clickAddPermissionButton(); await permissionsPage.addPermissionsDialog.clickAddPermissionButton();
await permissionsPage.addPermissionsDialog.checkAddPermissionDialogIsDisplayed(); await permissionsPage.addPermissionsDialog.checkAddPermissionDialogIsDisplayed();
await permissionsPage.addPermissionsDialog.checkSearchUserInputIsDisplayed(); await permissionsPage.addPermissionsDialog.checkSearchUserInputIsDisplayed();
await permissionsPage.addPermissionsDialog.searchUserOrGroup('GROUP_' + groupBody.id); await permissionsPage.addPermissionsDialog.searchUserOrGroup(groupBody.id);
await permissionsPage.addPermissionsDialog.clickUserOrGroup('GROUP_' + groupBody.id); await permissionsPage.addPermissionsDialog.clickUserOrGroup(groupBody.displayName);
await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded('GROUP_' + groupBody.id); await permissionsPage.addPermissionsDialog.checkUserOrGroupIsAdded(groupBody.id);
}); });
it('[C277100] Should display EVERYONE group in the search result set', async () => { it('[C277100] Should display EVERYONE group in the search result set', async () => {

4
lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.html
View File

@ -54,8 +54,8 @@
<mat-icon id="add-person-icon" mat-list-icon>person_add</mat-icon> <mat-icon id="add-person-icon" mat-list-icon>person_add</mat-icon>
</ng-template> </ng-template>
<p> <p>
{{item.entry?.properties['cm:authorityName']? {{item.entry?.properties['cm:authorityDisplayName']?
item.entry?.properties['cm:authorityName'] : item.entry?.properties['cm:authorityDisplayName'] :
item.entry?.properties['cm:owner']?.displayName}}</p> item.entry?.properties['cm:owner']?.displayName}}</p>
</mat-list-option> </mat-list-option>
</mat-selection-list> </mat-selection-list>

10
lib/core/i18n/en.json
View File

@ -429,6 +429,16 @@
"TEXT": "Back to home" "TEXT": "Back to home"
} }
}, },
"503": {
"TITLE": "An error occurred.",
"DESCRIPTION": "Service Temporarily Unavailable [503].",
"SECONDARY_BUTTON": {
"TEXT": ""
},
"RETURN_BUTTON": {
"TEXT": "Back to home"
}
},
"504": { "504": {
"TITLE": "An error occurred.", "TITLE": "An error occurred.",
"DESCRIPTION": "The server timed out, try again or contact IT support [504].", "DESCRIPTION": "The server timed out, try again or contact IT support [504].",