diff --git a/include/Webservices/VTQL_Parser.php b/include/Webservices/VTQL_Parser.php
index 6db3b61fc32408eb36695f84802e8c1f507a1ad5..77ed23d8880a1b21070eae660f2a76961afc5a2d 100644
--- a/include/Webservices/VTQL_Parser.php
+++ b/include/Webservices/VTQL_Parser.php
@@ -1160,9 +1160,9 @@ $this->out['select'] = $this->yystack[$this->yyidx + -7]->minor;
if($this->yystack[$this->yyidx + -5]->minor){
$this->out['from'] = $this->yystack[$this->yyidx + -5]->minor ;
}
-if(SEMI){
-$this->out['semi_colon'] = SEMI;
-}
+//if(SEMI){
+//$this->out['semi_colon'] = SEMI;
+//}
if($this->out['select']){
$this->buildSelectStmt($this->out);
}
@@ -1234,7 +1234,7 @@ $this->out['where_condition']['column_values'][sizeof($this->out['where_conditio
#line 1240 "e:\workspace\nonadmin\pkg\vtiger\extensions\Webservices\VTQL_parser.php"
#line 82 "e:\workspace\nonadmin\pkg\vtiger\extensions\Webservices\VTQL_parser.y"
function yy_r17(){
-$length = sizeof($this->out['where_condition']['column_values']);
+$length = ($this->out['where_condition']['column_values'])? sizeof($this->out['where_condition']['column_values']):0;
$pos = $length - 1;
if($pos < 0){
$pos = 0;
diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php
index 147fcf73f122f87e6c8ee308fe1176819e23061d..6a9752bc4089ce4cca46cb519ef99ef0157edc4e 100644
--- a/languages/en_us/Vtiger.php
+++ b/languages/en_us/Vtiger.php
@@ -1936,5 +1936,6 @@ $jsLanguageStrings = array(
'JS_PASSWORD_MISMATCH_ERROR' => 'Please re-enter passwords. The "new password" and "confirm password" values do not match.',
'LBL_LIST_DELETE_CONFIRMATION' => 'Are you sure you want to delete?',
'JS_WIDGET_RESIZING_WAIT_MSG' => 'Widget contents will load after resizing.',
- 'JS_COPIED_SUCCESSFULLY' => 'Copied successfully',
+ 'JS_COPIED_SUCCESSFULLY' => 'Copied successfully',
+ 'JS_ATLEAST_SELECT_ONE_FIELD' => 'Atleast one field should be selected',
);
diff --git a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
index 85c86156b3b95dd58c2d0964de13aea94d922a3b..4057fd09be55172f1ccd9c4661c0e9c990c3bfbc 100644
--- a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
@@ -133,7 +133,7 @@
{/if}
</li>
{/foreach}
- {if $LISTVIEW_LINKS['LISTVIEWSETTING']|@count gt 0}
+ {if !empty($LISTVIEW_LINKS['LISTVIEWSETTING']) && ($LISTVIEW_LINKS['LISTVIEWSETTING']|@count gt 0)}
{if empty($QUALIFIEDMODULE)}
{assign var=QUALIFIEDMODULE value=$MODULE}
{/if}
@@ -159,7 +159,7 @@
{/if}
{assign var=RESTRICTED_MODULE_LIST value=['Users', 'EmailTemplates']}
- {if $LISTVIEW_LINKS['LISTVIEWBASIC']|@count gt 0 and !in_array($MODULE, $RESTRICTED_MODULE_LIST)}
+ {if !empty($LISTVIEW_LINKS['LISTVIEWBASIC']) and ($LISTVIEW_LINKS['LISTVIEWBASIC']|@count gt 0) and (!in_array($MODULE, $RESTRICTED_MODULE_LIST))}
{if empty($QUALIFIED_MODULE)}
{assign var=QUALIFIED_MODULE value='Settings:'|cat:$MODULE}
{/if}
diff --git a/layouts/v7/modules/Vtiger/resources/List.js b/layouts/v7/modules/Vtiger/resources/List.js
index 42b72964126caa19d5071705bbda28458b586efd..4f8c8b5c77849395c8e47f199cc228b2f7c681bf 100644
--- a/layouts/v7/modules/Vtiger/resources/List.js
+++ b/layouts/v7/modules/Vtiger/resources/List.js
@@ -2336,7 +2336,7 @@ Vtiger.Class("Vtiger_List_Js", {
selectedFieldsList.on('click', '.removeField', function (e) {
var selectedFieldsEles = selectedFieldsList.find('.item');
if (selectedFieldsEles.length <= 1) {
- app.helper.showErrorNotification({message: app.vtranslate('Atleast one field should be selected')});
+ app.helper.showErrorNotification({message: app.vtranslate('JS_ATLEAST_SELECT_ONE_FIELD')});
return false;
}
var ele = jQuery(e.currentTarget);
diff --git a/modules/Settings/Profiles/views/EditAjax.php b/modules/Settings/Profiles/views/EditAjax.php
index 45f0a0f33e81286f6460acd34e40de2dafa530cb..6dbd41aba73c9a9a320bf2a0bdd8210530fe1c47 100644
--- a/modules/Settings/Profiles/views/EditAjax.php
+++ b/modules/Settings/Profiles/views/EditAjax.php
@@ -10,7 +10,7 @@
Class Settings_Profiles_EditAjax_View extends Settings_Profiles_Edit_View {
- public function preProcess(Vtiger_Request $request) {
+ public function preProcess(Vtiger_Request $request, $display=true) {
return true;
}
diff --git a/modules/Settings/SharingAccess/models/Module.php b/modules/Settings/SharingAccess/models/Module.php
index bce41635cea08dd6513bd5b34c7980b82d7c3513..0c2c54b3e635ef7b2f80803f9238660b8c5a8014 100644
--- a/modules/Settings/SharingAccess/models/Module.php
+++ b/modules/Settings/SharingAccess/models/Module.php
@@ -109,7 +109,7 @@ class Settings_SharingAccess_Module_Model extends Vtiger_Module_Model {
* Static Function to get the instance of Vtiger Module Model for all the modules
* @return <Array> - List of Vtiger Module Model or sub class instances
*/
- public static function getAll($editable=false) {
+ public static function getAll($presence = array(), $restrictedModulesList = array(), $editable=false) {
$db = PearDatabase::getInstance();
$moduleModels = array();
diff --git a/modules/Settings/Vtiger/models/Systems.php b/modules/Settings/Vtiger/models/Systems.php
index ebb4fba7becf3a251af40f8324524da80c163193..d36d27fcc939ce8c88c57ef8ab6ce657fe913ec2 100644
--- a/modules/Settings/Vtiger/models/Systems.php
+++ b/modules/Settings/Vtiger/models/Systems.php
@@ -21,7 +21,7 @@ class Settings_Vtiger_Systems_Model extends Vtiger_Base_Model{
return ($smtp_auth_value == 'on' || $smtp_auth_value == 1 || $smtp_auth_value == 'true') ? true : false;
}
- public function save() {
+ public function save($request) {
$db = PearDatabase::getInstance();
$id = $this->getId();
diff --git a/modules/Settings/Vtiger/views/IndexAjax.php b/modules/Settings/Vtiger/views/IndexAjax.php
index 77169d555afda1efdf54a9fd66bfb7322e30f6a5..ccb34249f77a90d5c45f03cad8c38d3a2c3ae6c0 100644
--- a/modules/Settings/Vtiger/views/IndexAjax.php
+++ b/modules/Settings/Vtiger/views/IndexAjax.php
@@ -14,7 +14,7 @@ class Settings_Vtiger_IndexAjax_View extends Settings_Vtiger_Index_View {
$this->exposeMethod('getSettingsShortCutBlock');
}
- public function preProcess (Vtiger_Request $request) {
+ public function preProcess (Vtiger_Request $request, $display=true) {
return;
}
diff --git a/modules/Vtiger/views/Basic.php b/modules/Vtiger/views/Basic.php
index 9625ee4641763043c665fefa85a3a9700f0fd055..f373715595a2795674ab36040934f5736bf06453 100644
--- a/modules/Vtiger/views/Basic.php
+++ b/modules/Vtiger/views/Basic.php
@@ -51,11 +51,12 @@ abstract class Vtiger_Basic_View extends Vtiger_Footer_View {
$supportGroup = $menuGroupedByParent['SUPPORT'];
unset($menuGroupedByParent['SUPPORT']);
$menuGroupedByParent['SUPPORT'] = $supportGroup;
+ $parentApp = $request->get('app');
foreach ($menuGroupedByParent as $parentCategory => $menuList) {
if($parentCategory == 'ANALYTICS' || $parentCategory == 'SETTINGS') continue;
if(count($menuList) > 0) {
- if(array_key_exists($selectedModule, $menuList) && $parentCategory) {
+ if(array_key_exists($selectedModule, $menuList) && ($parentCategory == $parentApp)) {
$moduleFound = true;
$selectedModuleMenuCategory = $parentCategory;
}
diff --git a/pkg/vtiger/modules/Webforms/settings/models/Field.php b/pkg/vtiger/modules/Webforms/settings/models/Field.php
index eb1383223bf927ea6bdd7fe19072ef4ed5b995de..1190f67709e6ac56d2dbef0fea212e429b3ede0d 100644
--- a/pkg/vtiger/modules/Webforms/settings/models/Field.php
+++ b/pkg/vtiger/modules/Webforms/settings/models/Field.php
@@ -82,7 +82,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model {
return $this->getPicklistValues();
}
- public function getDisplayValue($value) {
+ public function getDisplayValue($value, $record=false, $recordInstance = false) {
if ($this->getName() === 'enabled') {
$moduleName = 'Settings:Webforms';
if ($value) {
@@ -93,7 +93,7 @@ class Settings_Webforms_Field_Model extends Vtiger_Field_Model {
return parent::getDisplayValue($value);
}
- public function getPermissions() {
+ public function getPermissions($accessmode = false) {
return true;
}