yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gets validation working with composition alias conflicts

Browse Source
This commit is contained in:
Shannon
2015-10-09 19:03:11 +02:00
parent 6017e9ddf9
commit 2922e962e0
7 changed files with 114 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI.Client/src/common/services/util.service.js
View File

@@ -508,7 +508,7 @@ function umbDataFormatter() {
var realProperties = _.reject(g.properties, function (p) {
//do not include these properties
return p.propertyState === "init";
return p.propertyState === "init" || p.inherited === true;
});
var saveProperties = _.map(realProperties, function (p) {
@@ -518,9 +518,19 @@ function umbDataFormatter() {
saveGroup.properties = saveProperties;
//if this is an inherited group and there are not non-inherited properties on it, then don't send up the data
if (saveGroup.inherited === true && saveProperties.length === 0) {
return null;
}
return saveGroup;
});
//we don't want any null groups
saveModel.groups = _.reject(saveModel.groups, function(g) {
return !g;
});
return saveModel;
},

8
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
View File

@@ -96,10 +96,12 @@
<ng-form name="propertyTypeForm">
<div class="control-group -no-margin" ng-if="!sortingMode">
<umb-locked-field locked="locked"
<div class="umb-group-builder__property-meta-alias" ng-if="property.inherited">{{ property.alias }}</div>
<umb-locked-field ng-if="!property.inherited"
locked="locked"
ng-model="property.alias"
placeholder-text="'Alias...'"
server-validation-field="{{'Groups[' + $parent.$index + '].Properties[' + $index + '].Alias'}}">
server-validation-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Alias'}}">
</umb-locked-field>
<div class="umb-group-builder__property-meta-label">
@@ -107,7 +109,7 @@
name="groupName"
umb-auto-resize
required
val-server-field="{{'Groups[' + $parent.$index + '].Properties[' + $index + '].Label'}}"></textarea>
val-server-field="{{'Groups[' + $parent.$parent.$parent.$parent.$index + '].Properties[' + $index + '].Label'}}"></textarea>
<span class="help-inline" val-msg-for="groupName" val-toggle-msg="valServerField"></span>
</div>