From 8e08373d867f3cd9cc38edc0bbef3f2f04e4fc64 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Thu, 12 Jan 2017 08:49:06 +0530
Subject: [PATCH] Pickilist dependency block missed in Settings page
---
modules/Migration/schema/660_to_700.php | 4 +--
.../Settings/ModuleManager/models/Module.php | 27 ++++++++++++++-----
modules/Settings/ModuleManager/views/List.php | 3 +++
modules/Settings/Vtiger/models/Module.php | 2 +-
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index b085e08a9..8bc20ae3d 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -13,7 +13,7 @@ if(defined('VTIGER_UPGRADE')) {
$db = PearDatabase::getInstance();
$result = $db->pquery('SELECT 1 FROM vtiger_ws_fieldtype WHERE uitype=?', array('98'));
- if ($db->num_rows($result)) {
+ if (!$db->num_rows($result)) {
$db->pquery('INSERT INTO vtiger_ws_fieldtype(uitype,fieldtype) VALUES(?, ?)', array('98', 'reference'));
}
@@ -72,7 +72,7 @@ if(defined('VTIGER_UPGRADE')) {
if ($defaultEventStatusFieldModel) {
$defaultEventStatusFieldModel->set('defaultvalue', 'Planned');
$defaultEventStatusFieldModel->save();
- $db->pquery('UPDATE vtiger_users SET defaultactivitytype=? WHERE defaulteventstatus=? OR defaulteventstatus IS NULL', array('Planned', ''));
+ $db->pquery('UPDATE vtiger_users SET defaulteventstatus=? WHERE defaulteventstatus=? OR defaulteventstatus IS NULL', array('Planned', ''));
}
$fieldNamesList = array();
diff --git a/modules/Settings/ModuleManager/models/Module.php b/modules/Settings/ModuleManager/models/Module.php
index b0ef2f313..dce27bcce 100644
--- a/modules/Settings/ModuleManager/models/Module.php
+++ b/modules/Settings/ModuleManager/models/Module.php
@@ -11,25 +11,38 @@
class Settings_ModuleManager_Module_Model extends Vtiger_Module_Model {
public static function getNonVisibleModulesList() {
- return array('ModTracker', 'Users', 'Mobile', 'Integration', 'WSAPP', 'Dashboard', 'ConfigEditor', 'CronTasks',
- 'Import', 'Tooltip', 'Home', 'VtigerBackup', 'FieldFormulas', 'EmailTemplates', 'ExtensionStore');
+ return array('ModTracker', 'Users', 'Mobile', 'Integration', 'WSAPP', 'ModComments', 'Dashboard', 'ConfigEditor', 'CronTasks',
+ 'Import', 'Tooltip', 'CustomerPortal', 'Home', 'VtigerBackup', 'FieldFormulas', 'EmailTemplates', 'ExtensionStore');
}
-
/**
- * Function to get the url of new module import
+ * Function to get the url of new module import
*/
public static function getNewModuleImportUrl() {
$importURL = '';
$extensionStore = Vtiger_Module_Model::getInstance('ExtensionStore');
if($extensionStore && $extensionStore->isActive()) {
$importURL = Settings_ExtensionStore_Module_Model::getInstance()->getDefaultUrl();
- } else {
+ } else {
$importURL = 'index.php?module=ModuleManager&parent=Settings&view=ModuleImport';
}
return $importURL;
}
+ /**
+ * Function to get the url of Extension store
+ */
+ public static function getExtensionStoreUrl() {
+ return 'index.php?module=ExtensionStore&parent=Settings&view=ExtensionImport&mode=index';
+ }
+
+ /**
+ * Function to get the url of new module import
+ */
+ public static function getUserModuleFileImportUrl() {
+ return 'index.php?module=ModuleManager&parent=Settings&view=ModuleImport&mode=importUserModuleStep1';
+ }
+
/**
* Function to disable a module
* @param type $moduleName - name of the module
@@ -40,7 +53,7 @@ class Settings_ModuleManager_Module_Model extends Vtiger_Module_Model {
}
/**
- * Function to enable the module
+ * Function to enable the module
* @param type $moduleName -- name of the module
*/
public function enableModule($moduleName) {
@@ -91,7 +104,7 @@ class Settings_ModuleManager_Module_Model extends Vtiger_Module_Model {
$moduleModels = array();
for($i=0; $i<$db->num_rows($result); ++$i) {
- $row = $db->query_result_rowdata($result, $i);
+ $row = $db->query_result_rowdata($result, $i);
$moduleModels[$row['name']] = self::getInstanceFromArray($row);
}
return $moduleModels;
diff --git a/modules/Settings/ModuleManager/views/List.php b/modules/Settings/ModuleManager/views/List.php
index 554d4b5e5..465c2bf3a 100644
--- a/modules/Settings/ModuleManager/views/List.php
+++ b/modules/Settings/ModuleManager/views/List.php
@@ -18,6 +18,9 @@ Class Settings_ModuleManager_List_View extends Settings_Vtiger_Index_View {
$viewer->assign('ALL_MODULES', Settings_ModuleManager_Module_Model::getAll());
$viewer->assign('RESTRICTED_MODULES_LIST', Settings_ModuleManager_Module_Model::getActionsRestrictedModulesList());
$viewer->assign('IMPORT_MODULE_URL', Settings_ModuleManager_Module_Model::getNewModuleImportUrl());
+ $viewer->assign('EXTENSION_LOADER', function_exists('_vtextnld'));
+ $viewer->assign('IMPORT_EXTENSION_STORE_URL', Settings_ModuleManager_Module_Model::getExtensionStoreUrl());
+ $viewer->assign('IMPORT_USER_MODULE_FROM_FILE_URL', Settings_ModuleManager_Module_Model::getUserModuleFileImportUrl());
$viewer->assign('MODULE', $moduleName);
$viewer->assign('USER_MODEL', Users_Record_Model::getCurrentUserModel());
diff --git a/modules/Settings/Vtiger/models/Module.php b/modules/Settings/Vtiger/models/Module.php
index 95f31dc57..e9470413c 100644
--- a/modules/Settings/Vtiger/models/Module.php
+++ b/modules/Settings/Vtiger/models/Module.php
@@ -162,7 +162,7 @@ class Settings_Vtiger_Module_Model extends Vtiger_Base_Model {
$finalResult = array( 'block' => $db->query_result($result, 0, 'blockname'),
'menu' => $db->query_result($result, 0, 'menu'));
} elseif ($numOfRows > 1) {
- $result = $db->pquery("$query AND linkto LIKE '%$view%'", array());
+ $result = $db->pquery("$query AND linkto LIKE '%view=$view%'", array());
$numOfRows = $db->num_rows($result);
if ($numOfRows == 1) {
$finalResult = array( 'block' => $db->query_result($result, 0, 'blockname'),
--
GitLab