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

Merge branch 'v8/8.8' into v8/8.9

Browse Source
This commit is contained in:
Sebastiaan Janssen
2020-12-14 15:07:38 +01:00
parent ca098e8a01 d5d7d31c08
commit 58c6e655b3
7 changed files with 81 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
View File

@@ -1,6 +1,6 @@
<div>
<ng-form name="tabbedContentForm">
<div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
<div class="umb-group-panel" retrive-dom-element="registerPropertyGroup(element[0], attributes.appAnchor)" data-app-anchor="{{group.id}}" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.id">
<div class="umb-group-panel__header">
<div id="group-{{group.id}}">{{ group.label }}</div>

2
src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
View File

@@ -2,7 +2,7 @@
<ng-form name="elementTypeContentForm">
<div class="umb-group-panel"
data-element="group-{{group.alias}}"
ng-repeat="group in vm.model.variants[0].tabs track by group.label">
ng-repeat="group in vm.model.variants[0].tabs track by group.id">
<div class="umb-group-panel__header">
<div id="group-{{group.id}}">{{ group.label }}</div>

2
src/Umbraco.Web.UI.Client/src/views/components/member/umb-member-node-info.html
View File

@@ -1,7 +1,7 @@
<div class="umb-package-details">
<div class="umb-package-details__main-content">
<umb-box data-element="node-info-membership" ng-repeat="group in node.tabs| filter: {properties:{view:'readonlyvalue'}} track by group.label">
<umb-box data-element="node-info-membership" ng-repeat="group in node.tabs| filter: {properties:{view:'readonlyvalue'}} track by group.id">
<div class="umb-group-panel__header">
<div>{{ group.label }}</div>

2
src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
View File

@@ -1,5 +1,5 @@
<div class="form-horizontal" ng-controller="Umbraco.Editors.Media.Apps.ContentController as vm">
<div class="umb-group-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.label">
<div class="umb-group-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs | filter: { hide : '!' + true } track by group.id">
<div class="umb-group-panel__header">
<div>{{ group.label }}</div>

2
src/Umbraco.Web.UI.Client/src/views/member/apps/content/content.html
View File

@@ -1,6 +1,6 @@
<div class="form-horizontal" ng-controller="Umbraco.Editors.Member.Apps.ContentController as vm">
<div class="umb-group-panel" ng-repeat="group in content.tabs track by group.label">
<div class="umb-group-panel" ng-repeat="group in content.tabs track by group.id">
<div class="umb-group-panel__header">
<div>{{ group.label }}</div>