From 530b40e4e6406e6ff5d4d03c521769fd7c9af902 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Wed, 11 Jan 2017 20:00:20 +0530
Subject: [PATCH] Pickilist dependency block missed in Settings page
---
.../v7/modules/Vtiger/AddDashBoardTabForm.tpl | 2 +-
layouts/v7/modules/Vtiger/resources/Detail.js | 5 +++++
layouts/v7/modules/Vtiger/resources/List.js | 14 +++++++++++--
modules/Migration/schema/660_to_700.php | 20 +++++++++----------
4 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl b/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
index 27270b5f5..46920355f 100644
--- a/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
+++ b/layouts/v7/modules/Vtiger/AddDashBoardTabForm.tpl
@@ -8,7 +8,7 @@
************************************************************************************}
{strip}
<div class="modal-dialog modelContainer">
- {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE="Add Tab"}
+ {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE="{vtranslate('LBL_ADD_DASHBOARD')}"}
<div class="modal-content">
<form id="AddDashBoardTab" name="AddDashBoardTab" method="post" action="index.php">
<input type="hidden" name="module" value="{$MODULE}"/>
diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js
index ce8e8db8e..e9087bb42 100644
--- a/layouts/v7/modules/Vtiger/resources/Detail.js
+++ b/layouts/v7/modules/Vtiger/resources/Detail.js
@@ -2202,6 +2202,11 @@ Vtiger.Class("Vtiger_Detail_Js",{
app.request.post({data:params}).then(function(err,data){
element.removeClass('processing');
})
+ if(element.hasClass('active')){
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_FOLLOW_RECORD')});
+ } else {
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_UNFOLLOW_RECORD')});
+ }
});
},
diff --git a/layouts/v7/modules/Vtiger/resources/List.js b/layouts/v7/modules/Vtiger/resources/List.js
index d085f522e..14d678c8f 100644
--- a/layouts/v7/modules/Vtiger/resources/List.js
+++ b/layouts/v7/modules/Vtiger/resources/List.js
@@ -1639,11 +1639,17 @@ Vtiger.Class("Vtiger_List_Js", {
}
element.removeClass('processing');
})
- app.helper.showSuccessNotification({"message": app.vtranslate("JS_SUCCESS")});
+ if(element.hasClass('active')){
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_FOLLOW_RECORD')});
+ } else {
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_UNFOLLOW_RECORD')});
+ }
});
},
massStarSave: function (params) {
var self = this;
+ var listInstance = window.app.controller();
+ var selectedRecordCount = listInstance.getSelectedRecordCount();
params.module = this.getModuleName();
params.action = 'SaveStar';
var cvId = this.getCurrentCvId();
@@ -1656,7 +1662,11 @@ Vtiger.Class("Vtiger_List_Js", {
app.helper.hideProgress();
self.loadListViewRecords().then(function (e) {
self.clearList();
- app.helper.showSuccessNotification({"message": ''});
+ if(params.value == 1){
+ app.helper.showSuccessNotification({'message':(app.vtranslate('JS_FOLLOWING')) +' '+ selectedRecordCount +' '+ app.vtranslate(params.module)});
+ } else {
+ app.helper.showSuccessNotification({'message':app.vtranslate('JS_UNFOLLOWING') +' '+ selectedRecordCount +' '+ app.vtranslate(params.module)});
+ }
});
})
},
diff --git a/modules/Migration/schema/660_to_700.php b/modules/Migration/schema/660_to_700.php
index cd799a67f..b085e08a9 100644
--- a/modules/Migration/schema/660_to_700.php
+++ b/modules/Migration/schema/660_to_700.php
@@ -1822,20 +1822,20 @@ if(defined('VTIGER_UPGRADE')) {
$db->pquery('INSERT INTO vtiger_settings_blocks(blockid, label, sequence) VALUES(?, ?, ?)', array($configurationBlockId, 'LBL_CONFIGURATION', 4));
}
- $configurationFields = array( 'LBL_COMPANY_DETAILS' => 'index.php?parent=Settings&module=Vtiger&view=CompanyDetails',
- 'LBL_CUSTOMER_PORTAL' => 'index.php?module=CustomerPortal&parent=Settings&view=Index',
- 'LBL_CURRENCY_SETTINGS' => 'index.php?parent=Settings&module=Currency&view=List',
- 'LBL_MAIL_SERVER_SETTINGS' => 'index.php?parent=Settings&module=Vtiger&view=OutgoingServerDetail',
- 'Configuration Editor' => 'index.php?module=Vtiger&parent=Settings&view=ConfigEditorDetail',
- 'LBL_PICKLIST_EDITOR' => 'index.php?parent=Settings&module=Picklist&view=Index',
- 'LBL_PICKLIST_DEPENDENCY_SETUP' => 'index.php?parent=Settings&module=PickListDependency&view=List',
- 'LBL_MENU_EDITOR' => 'index.php?module=MenuEditor&parent=Settings&view=Index');
-
+ $configurationFields = array( 'LBL_COMPANY_DETAILS' => 'index.php?parent=Settings&module=Vtiger&view=CompanyDetails',
+ 'LBL_CUSTOMER_PORTAL' => 'index.php?module=CustomerPortal&parent=Settings&view=Index',
+ 'LBL_CURRENCY_SETTINGS' => 'index.php?parent=Settings&module=Currency&view=List',
+ 'LBL_MAIL_SERVER_SETTINGS' => 'index.php?parent=Settings&module=Vtiger&view=OutgoingServerDetail',
+ 'Configuration Editor' => 'index.php?module=Vtiger&parent=Settings&view=ConfigEditorDetail',
+ 'LBL_PICKLIST_EDITOR' => 'index.php?parent=Settings&module=Picklist&view=Index',
+ 'LBL_PICKLIST_DEPENDENCY' => 'index.php?parent=Settings&module=PickListDependency&view=List',
+ 'LBL_MENU_EDITOR' => 'index.php?module=MenuEditor&parent=Settings&view=Index');
+
+ $db->pquery('UPDATE vtiger_settings_field SET name=? WHERE name=?', array('LBL_PICKLIST_DEPENDENCY', 'LBL_PICKLIST_DEPENDENCY_SETUP'));
$configurationSequence = 1;
foreach ($configurationFields as $fieldName => $linkTo) {
$db->pquery('UPDATE vtiger_settings_field SET sequence=?, linkto=?, blockid=? WHERE name=?', array($configurationSequence++, $linkTo, $configurationBlockId, $fieldName));
}
- $db->pquery('UPDATE vtiger_settings_field SET name=? WHERE name=? AND blockid=?', array('LBL_PICKLIST_DEPENDENCY', 'LBL_PICKLIST_DEPENDENCY_SETUP', $configurationBlockId));
//End:: configuration block
//Start:: marketing sales block
--
GitLab