Merge branch '90' into 'master'

#90 - User can edit profile through My Preference and can set duplicate username

Issue: #289

See merge request !98

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

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;
         }
 	}