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

Allows editing the property metadata even if the property type is locked

Browse Source
This commit is contained in:
Shannon
2018-01-26 16:24:40 -07:00
parent e039265fab
commit f7eec8dafb
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
View File

@@ -489,7 +489,7 @@
scope.editPropertyTypeSettings = function(property, group) { scope.editPropertyTypeSettings = function(property, group) {
if (!property.inherited && !property.locked) { if (!property.inherited) {
scope.propertySettingsDialogModel = {}; scope.propertySettingsDialogModel = {};
scope.propertySettingsDialogModel.title = "Property settings"; scope.propertySettingsDialogModel.title = "Property settings";
@@ -547,6 +547,7 @@
property.validation.pattern = oldModel.property.validation.pattern; property.validation.pattern = oldModel.property.validation.pattern;
property.showOnMemberProfile = oldModel.property.showOnMemberProfile; property.showOnMemberProfile = oldModel.property.showOnMemberProfile;
property.memberCanEdit = oldModel.property.memberCanEdit; property.memberCanEdit = oldModel.property.memberCanEdit;
property.isSensitiveValue = oldModel.property.isSensitiveValue;
// because we set state to active, to show a preview, we have to check if has been filled out // because we set state to active, to show a preview, we have to check if has been filled out
// label is required so if it is not filled we know it is a placeholder // label is required so if it is not filled we know it is a placeholder

6
src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html
View File

@@ -1,6 +1,6 @@
<div class="content-type-editor-dialog edit-property-settings" ng-controller="Umbraco.Overlay.PropertySettingsOverlay as vm"> <div class="content-type-editor-dialog edit-property-settings" ng-controller="Umbraco.Overlay.PropertySettingsOverlay as vm">
<div class="umb-control-group"> <div class="umb-control-group" ng-if="!model.property.locked">
<div class="control-group"> <div class="control-group">
<textarea class="editor-label" <textarea class="editor-label"
data-element="property-name" data-element="property-name"
@@ -33,7 +33,7 @@
</textarea> </textarea>
</div> </div>
<div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component> <div class="editor-wrapper umb-control-group control-group" ng-model="model.property.editor" val-require-component ng-if="!model.property.locked">
<a data-element="editor-add" href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openEditorPickerOverlay(model.property)"> <a data-element="editor-add" href="" ng-if="!model.property.editor" class="editor-placeholder" hotkey="alt+shift+e" ng-click="vm.openEditorPickerOverlay(model.property)">
<localize key="shortcuts_addEditor"></localize> <localize key="shortcuts_addEditor"></localize>
@@ -61,7 +61,7 @@
</div> </div>
<div class="umb-control-group clearfix"> <div class="umb-control-group clearfix" ng-if="!model.property.locked">
<h5><localize key="validation_validation"></localize></h5> <h5><localize key="validation_validation"></localize></h5>

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

@@ -256,7 +256,7 @@
<!-- row tools --> <!-- row tools -->
<div class="umb-group-builder__property-actions" ng-if="!sortingMode"> <div class="umb-group-builder__property-actions" ng-if="!sortingMode">
<div ng-if="!property.inherited && !property.locked"> <div ng-if="!property.inherited">
<!-- settings for property --> <!-- settings for property -->
<div class="umb-group-builder__property-action" ng-click="editPropertyTypeSettings(property, tab)"> <div class="umb-group-builder__property-action" ng-click="editPropertyTypeSettings(property, tab)">
@@ -264,7 +264,7 @@
</div> </div>
<!-- delete property --> <!-- delete property -->
<div class="umb-group-builder__property-action"> <div ng-if="!property.locked" class="umb-group-builder__property-action">
<i class="icon-trash" ng-click="togglePrompt(property)"></i> <i class="icon-trash" ng-click="togglePrompt(property)"></i>
<umb-confirm-action <umb-confirm-action
ng-if="property.deletePrompt" ng-if="property.deletePrompt"