diff --git a/.gitignore b/.gitignore index 1b58a932618a4de5ed7cea69c5b4ac23fd04787a..585abce2b3edb78d0d5e1b4aa2f0db528c23fccb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vendor/* !vendor/.htaccess +.vscode/* \ No newline at end of file diff --git a/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl b/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl index db9c43a4e8630bfd386a164c8a998f9b1dfa9351..af3e377fa43988bde4aaf523e938994d03bc64ed 100644 --- a/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl +++ b/layouts/v7/modules/Settings/LayoutEditor/FieldCreate.tpl @@ -141,7 +141,7 @@ <input type="hidden" name="presence" value="1"/> <label class="checkbox"> <input type="checkbox" class ='cursorPointer bootstrap-switch' id="fieldPresence" name="presence" {if $FIELD_MODEL->isViewable()} checked {/if} - {if $FIELD_MODEL->isActiveOptionDisabled()} readonly="readonly" {/if} {if $FIELD_MODEL->isMandatory()} readonly="readonly" {/if} + {if $FIELD_MODEL->isActiveOptionDisabled()} optionDisabled = "true" readonly="readonly" {/if} {if $FIELD_MODEL->isMandatory()} readonly="readonly" {/if} data-on-text="Yes" data-off-text="No" value="{$FIELD_MODEL->get('presence')}"/> </label> </div> diff --git a/layouts/v7/modules/Settings/LayoutEditor/resources/LayoutEditor.js b/layouts/v7/modules/Settings/LayoutEditor/resources/LayoutEditor.js index 603295ad483fb289926f00a407a999790458ae88..b8c46da53ff8d0d5382aa5d164dc864492fe26c3 100644 --- a/layouts/v7/modules/Settings/LayoutEditor/resources/LayoutEditor.js +++ b/layouts/v7/modules/Settings/LayoutEditor/resources/LayoutEditor.js @@ -504,15 +504,19 @@ Vtiger.Class('Settings_LayoutEditor_Js', { data.find('input[name="quickcreate"]').prop('checked', true).attr('readonly', 'readonly'); data.find('input[name="quickcreate"]').removeClass('cursorPointer').addClass('cursorPointerNotAllowed'); } - data.find('input[name="presence"]').attr('checked', true).attr('readonly', 'readonly'); - data.find('#fieldPresence').bootstrapSwitch('toggleReadonly', true); + if(data.find('#fieldPresence').attr('optionDisabled') != 'true'){ + data.find('input[name="presence"]').attr('checked', true).attr('readonly', 'readonly'); + data.find('#fieldPresence').bootstrapSwitch('toggleReadonly', true); + } } else { if (data.find('input[name="isquickcreatesupported"]').val()) { data.find('input[name="quickcreate"]').removeAttr('readonly'); data.find('input[name="quickcreate"]').removeClass('cursorPointerNotAllowed').addClass('cursorPointer'); } - data.find('input[name="presence"]').removeAttr('readonly'); - data.find('#fieldPresence').bootstrapSwitch('toggleReadonly'); + if(data.find('#fieldPresence').attr('optionDisabled') != 'true'){ + data.find('input[name="presence"]').removeAttr('readonly'); + data.find('#fieldPresence').bootstrapSwitch('toggleReadonly'); + } } }) data.find('input[type="checkbox"]').on('click', function (e) {