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

Merge remote-tracking branch 'origin/v10/feature/variant-permissions' into v10/feature/variant-permissions

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-05-16 14:00:22 +02:00
parent 27421cef2a 279dd0cf0c
commit 544dcffa18
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,14 +15,11 @@
show-inherit="vm.model.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
inherits-from="defaultVariant.language.name">
<div ng-class="{'o-40 cursor-not-allowed': vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue}">
<umb-property-editor
model="property"
preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
ng-attr-readonly="{{vm.model.language.culture === 'da-DK' || undefined}}">
<!-- TODO: Update with correct check for readonly -->
</umb-property-editor>
</div>
<umb-property-editor
model="property"
preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
ng-attr-readonly="{{!vm.allowUpdate || undefined}}">
</umb-property-editor>
</umb-property>
</umb-box-content>
@@ -47,14 +44,11 @@
show-inherit="vm.model.variants.length > 1 && !property.culture && !activeVariant.language.isDefault"
inherits-from="defaultVariant.language.name">
<div ng-class="{'o-40 cursor-not-allowed': vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue}">
<umb-property-editor
model="property"
preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
ng-attr-readonly="{{vm.model.language.culture === 'da-DK' || undefined}}">
<!-- TODO: Update with correct check for readonly -->
</umb-property-editor>
</div>
<umb-property-editor
model="property"
preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
ng-attr-readonly="{{!vm.allowUpdate || undefined}}">
</umb-property-editor>
</umb-property>
</div>

6
src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umbelementeditorcontent.component.js
View File

@@ -42,6 +42,12 @@
}
});
$scope.$watchCollection('vm.model.variants', (newValue) => {
if (newValue && newValue.length > 0) {
vm.allowUpdate = newValue[0].allowedActions.includes('A');
}
});
function getScope() {
return $scope;
}