Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-931 at
cms-community / hippo-addon-channel-manager
Commits:
14bd0f35 by Mark at 2016-10-28T12:21:12+02:00
CHANNELMGR-931: is empty also trigger if there are no field values of the field
id
- - - - -
f74e4da3 by Mark at 2016-10-28T12:21:44+02:00
CHANNELMGR-931: recursive call for compound fields
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
Changes:
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=====================================
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -27,7 +27,7 @@ export class ChannelFieldsCtrl {
}
isEmptyMultiple(field) {
- return field.multiple && this.fieldValues[field.id].length === 0;
+ return field.multiple && (!this.fieldValues[field.id] ||
this.fieldValues[field.id].length === 0);
}
isFieldFocused(field) {
=====================================
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=====================================
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -33,8 +33,8 @@
ng-blur="$ctrl.onFieldBlur()">
</textarea>
- <!-- TODO: remove once all field types for PSP1 have been implemented -->
- <input ng-switch-default disabled value="TODO">
+ <channel-fields field-types="::fieldType.fields"
field-values="$ctrl.fieldValues[fieldType.id]"
+ ng-switch-when="COMPOUND"></channel-fields>
</md-input-container>
</div>
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/18e324bf769d3b9e06e1ee470d76cd813732a6ad...f74e4da3837c91056ff86173ab8bceb4537aa893
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
