fix null aspectNames in check for smart folder

This commit is contained in:
Eugenio Romano 2018-09-18 17:09:16 +01:00
parent a801f656a7
commit ec633f27d6
3 changed files with 8 additions and 5 deletions

View File

@ -50,7 +50,6 @@ describe('Start Task - Custom App', () => {
let attachmentListPage = new AttachmentListPage(); let attachmentListPage = new AttachmentListPage();
let appNavigationBarPage = new AppNavigationBarPage(); let appNavigationBarPage = new AppNavigationBarPage();
let processUserModel, assigneeUserModel; let processUserModel, assigneeUserModel;
let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM;
let formTextField = app.form_fields.form_fieldId; let formTextField = app.form_fields.form_fieldId;

View File

@ -168,8 +168,8 @@ export class ShareDataTableAdapter implements DataTableAdapter {
} }
isSmartFolder(node: any) { isSmartFolder(node: any) {
return node.entry.aspectNames.indexOf('smf:customConfigSmartFolder') > -1 || return node.entry.aspectNames && (node.entry.aspectNames.indexOf('smf:customConfigSmartFolder') > -1 ||
(node.entry.aspectNames.indexOf('smf:systemConfigSmartFolder') > -1); (node.entry.aspectNames.indexOf('smf:systemConfigSmartFolder') > -1));
} }
private sortRows(rows: DataRow[], sorting: DataSorting) { private sortRows(rows: DataRow[], sorting: DataSorting) {

View File

@ -124,8 +124,12 @@ do
fi fi
if [ ! -f package/bundles/assets/$PACKAGE/i18n/en.json ]; then if [ ! -f package/bundles/assets/$PACKAGE/i18n/en.json ]; then
error_out '31;1' "$PACKAGE i18n not found!" >&2 if [ $PACKAGE == 'adf-extensions' ]; then
exit 1 echo "no i18n needed"
else
error_out '31;1' "$PACKAGE i18n not found!" >&2
exit 1
fi
else else
echo "i18n ok!" echo "i18n ok!"
fi fi