Skip to content
Snippets Groups Projects
Commit 1933e65c authored by Satish's avatar Satish
Browse files

List view search is not working in Users page

parent ffa7475a
No related branches found
No related tags found
No related merge requests found
......@@ -34,6 +34,12 @@ class Inventory_MassEditRecordStructure_Model extends Vtiger_MassEditRecordStruc
foreach($fieldModelList as $fieldName=>$fieldModel) {
if($fieldModel->isEditable() && $fieldModel->isMassEditable()) {
if($fieldModel->isViewable() && $this->isFieldRestricted($fieldModel)) {
if ($fieldModel->isMandatory()) {
$dataType = $fieldModel->get('typeofdata');
$explodeDataType = explode('~', $dataType);
$fieldModel->set('typeofdata', $explodeDataType[0] . '~O');
}
if($recordExists) {
$fieldModel->set('fieldvalue', $recordModel->get($fieldName));
if ($fieldName == 'terms_conditions') {
......
......@@ -12,6 +12,11 @@ if(defined('VTIGER_UPGRADE')) {
global $adb, $current_user;
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT 1 FROM vtiger_ws_fieldtype WHERE uitype=?', array('98'));
if ($db->num_rows($result)) {
$db->pquery('INSERT INTO vtiger_ws_fieldtype(uitype,fieldtype) VALUES(?, ?)', array('98', 'reference'));
}
if (!Vtiger_Utils::CheckTable('vtiger_activity_recurring_info')) {
$db->pquery('CREATE TABLE IF NOT EXISTS vtiger_activity_recurring_info(activityid INT(19) NOT NULL, recurrenceid INT(19) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;', array());
}
......
......@@ -34,6 +34,12 @@ class Vtiger_MassEditRecordStructure_Model extends Vtiger_EditRecordStructure_Mo
foreach($fieldModelList as $fieldName=>$fieldModel) {
if($fieldModel->isEditable() && $fieldModel->isMassEditable()) {
if($fieldModel->isViewable() && $this->isFieldRestricted($fieldModel)) {
if ($fieldModel->isMandatory()) {
$dataType = $fieldModel->get('typeofdata');
$explodeDataType = explode('~', $dataType);
$fieldModel->set('typeofdata', $explodeDataType[0] . '~O');
}
if($recordExists) {
$fieldModel->set('fieldvalue', $recordModel->get($fieldName));
}
......
No preview for this file type
......@@ -10,6 +10,7 @@
// Switch the working directory to base
chdir(dirname(__FILE__) . '/../..');
include_once 'includes/Loader.php';
include_once 'include/Zend/Json.php';
include_once 'vtlib/Vtiger/Module.php';
include_once 'include/utils/VtlibUtils.php';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment