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

rename properties to match model

Browse Source
This commit is contained in:
Mads Rasmussen
2015-05-28 12:25:06 +02:00
parent 936e31c5df
commit 80096c941b
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js
View File

@@ -70,14 +70,14 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
// set inherited state on tab
compositionGroup.inherited = true;
compositionGroup.inheritedFromId = compositeContentType.id;
compositionGroup.inheritedFromName = compositeContentType.name;
compositionGroup.contentTypeId = compositeContentType.id;
compositionGroup.contentTypeName = compositeContentType.name;
// set inherited state on properties
angular.forEach(compositionGroup.properties, function(property){
property.inherited = true;
property.inheritedFromId = compositeContentType.id;
property.inheritedFromName = compositeContentType.name;
property.contentTypeId = compositeContentType.id;
property.contentTypeName = compositeContentType.name;
});
// set tab state
@@ -114,7 +114,7 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
angular.forEach($scope.contentType.groups, function(contentTypeGroup){
// remove inherited tabs
if( contentTypeGroup.inheritedFromId === compositeContentType.id ) {
if( contentTypeGroup.contentTypeId === compositeContentType.id ) {
var newProperties = false;
@@ -137,7 +137,7 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
// create new array of properties which are not inherited
angular.forEach(contentTypeGroup.properties, function(property){
if(property.inheritedFromId !== compositeContentType.id) {
if(property.contentTypeId !== compositeContentType.id) {
newPropertiesArray.push(property);
}
});
@@ -338,6 +338,8 @@ function DocumentTypeEditController($scope, $rootScope, $routeParams, $log, cont
property.propertyState = "active";
console.log(property);
// open data type configuration
$scope.configDataType(property);

11
src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html
View File

@@ -49,9 +49,14 @@
</div>
<!-- TAB ACTIVE OR INACTIVE STATE -->
<div class="edt-tab-inherited-from" ng-if="tab.inherited"><i class="icon icon-merge"></i> Inherited from {{ tab.inheritedFromName }}</div>
<div class="edt-tab-inherited-from" ng-if="tab.inherited">
<i class="icon icon-merge"></i> Inherited from {{ tab.inheritedFromName }}
<span ng-repeat="contentTypeName in tab.parentTabContentTypeNames">
{{ contentTypeName }}
<span ng-if="!$last">, </span>
</span>
</div>
<div class="edt-tab umb-card edt-tab-handle" ng-class="{'tab-state-active':tab.tabState=='active', 'tab-state-inactive': tab.tabState=='inActive', 'tab-is-inherited': tab.inherited}" ng-click="activateTab(tab)" ng-if="tab.tabState !== 'init'">
@@ -111,7 +116,7 @@
<!-- property meta text -->
<div class="edt-property-meta" ng-class="{'edt-property-handle': sortingMode}">
<div class="edt-property-inherited-from" ng-if="property.inherited"><i class="icon icon-merge"></i> Inherited from {{property.inheritedFromName}}</div>
<div class="edt-property-inherited-from" ng-if="property.inherited"><i class="icon icon-merge"></i> Inherited from {{property.contentTypeName}}</div>
<div ng-if="!sortingMode">
<div class="edt-property-meta-alias invisible-field">