From 865d313d1c442bba4d96a3506a1b9f5df47c8c81 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Tue, 30 Aug 2016 16:29:48 +0530
Subject: [PATCH] #90 - User can edit profile through My Preference and can set
duplicate username
---
layouts/vlayout/modules/Vtiger/uitypes/String.tpl | 2 +-
modules/Users/models/Field.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/String.tpl b/layouts/vlayout/modules/Vtiger/uitypes/String.tpl
index 182b14d2c..9ef6e8a48 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/String.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/String.tpl
@@ -14,6 +14,6 @@
{assign var="SPECIAL_VALIDATOR" value=$FIELD_MODEL->getValidator()}
{assign var="FIELD_NAME" value=$FIELD_MODEL->get('name')}
<input id="{$MODULE}_editView_fieldName_{$FIELD_NAME}" type="text" class="input-large {if $FIELD_MODEL->isNameField()}nameField{/if}" data-validation-engine="validate[{if $FIELD_MODEL->isMandatory() eq true}required,{/if}funcCall[Vtiger_Base_Validator_Js.invokeValidation]]" name="{$FIELD_MODEL->getFieldName()}" value="{$FIELD_MODEL->get('fieldvalue')}"
-{if $FIELD_MODEL->get('uitype') eq '3' || $FIELD_MODEL->get('uitype') eq '4'|| $FIELD_MODEL->isReadOnly()} readonly {/if} data-fieldinfo='{$FIELD_INFO}' {if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if} />
+{if $FIELD_MODEL->get('uitype') eq '3' || $FIELD_MODEL->get('uitype') eq '4'|| ($FIELD_MODEL->isReadOnly() && $FIELD_MODEL->get('uitype') neq '106')} readonly {/if} data-fieldinfo='{$FIELD_INFO}' {if !empty($SPECIAL_VALIDATOR)}data-validator={Zend_Json::encode($SPECIAL_VALIDATOR)}{/if} />
{* TODO - Handler Ticker Symbol field *}
{/strip}
\ No newline at end of file
diff --git a/modules/Users/models/Field.php b/modules/Users/models/Field.php
index 018823ac7..4a858cfaf 100644
--- a/modules/Users/models/Field.php
+++ b/modules/Users/models/Field.php
@@ -19,7 +19,7 @@ class Users_Field_Model extends Vtiger_Field_Model {
*/
public function isReadOnly() {
$currentUserModel = Users_Record_Model::getCurrentUserModel();
- if(($currentUserModel->isAdminUser() == false && $this->get('uitype') == 98) || $this->get('uitype') == 156 || $this->get('uitype') == 115) {
+ if(($currentUserModel->isAdminUser() == false && $this->get('uitype') == 98) || in_array($this->get('uitype'), array(106, 115, 156))) {
return true;
}
}
--
GitLab