From dcc881faafaa831a9dfaa5dfc6a8c3d3c9770af6 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Thu, 9 Feb 2017 19:19:14 +0530
Subject: [PATCH] Showing error message while clicking on provide configuration
through non admin.
---
packages/vtiger/mandatory/PBXManager.zip | Bin 74734 -> 75574 bytes
.../modules/PBXManager/models/Module.php | 36 ++++++++-------
.../modules/PBXManager/views/List.php | 41 ++++++++++++++++++
3 files changed, 61 insertions(+), 16 deletions(-)
create mode 100644 pkg/vtiger/modules/PBXManager/modules/PBXManager/views/List.php
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index f8f566a209efd55447e926e9de8735f490f1e640..6a2d99700d1d27f3613716458aeb251f7398f028 100644
GIT binary patch
delta 2309
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
E4gQ5A4FCWD
delta 1543
zcmY+EX*kqd9LMMUXR>506^Se}n31K646<b_H6@g-=QcCh>Dn@`n5e-Gm9f;noP^9R
zS*jtX$d#u^X;erd%3d>3aYgk=xc}<aJ+D6J_k5r4?{nUqx(>or8{r0tFE5GArrY6e
z7|{qgTmZU}Z_M?H%I$VkT5{t)2!EoIY&~bxZon=gv!xNXdeEb8g^-Yg@2B!@1Lx{(
z8wc4cPT3|kvN!uVN#cV30)3C?+a`OahZ+~YYAa5)B&I6q)jZs1v_s5SWi%Jb5vZ%Y
zEf-Q!rHb=#0RqnP)dTnA)&-k4<KNBTg3?W$Dic@Vzsw!ad>HY$Zq4f|`;2<Jlu=#k
z=4W{Z#_9Lo<GkeUs4~~Q53QA!@ne`o(j=E0`=Q;K*_tkQXF`>_=fme7W*K|Vi2NhE
zvKz#u+*1+C^i$p9`ZjbnE|MsH^2ON`X^uM2*R@2Bw`M5S?yw4O>hg^0Yd^e^>>o~8
znNi_cWk%ylmd7fSSfulNO%s>IMGtr+w@%b_O*m`A317po3ja&<3AG*<{VKgCjE>J6
zXW`N71~E78`OEsr>7|v191MA4Y;P>Zv*=sjRrsgTj?&7C_&K*r9l=D8i~1)W*OsK@
ztMy9UHt4NzX3%Gk6{wOMj+~qE@2@k?t))?h%&zxxW&E$~tsXA*ZE+fvktviV2Dpzp
zs4G@^2ETQDS&`e+F4<eQXt7f(FnklUhJs`;s;yZTg1XP4uezmdd7KpXgInN8X1`Fb
zu0_MV1a|WK33pwbsLHL?r;}A#D<+sW)k9`Dt)fFcIwlc%hB-MSx11}>@S;A3|8c|W
zz{}h{8Dm7<7s>@6rd-q*PxsUm5-TOyGerhkbBTAna~5rdA7yFekTa)-!$0&`ag-7s
zrLFLOeAunIm=ewBAXaU?O#xT0FLbERnY<*XFAsJ1CJhzVxqFn~cW-pC`&{fp$x@kQ
z=Os{ElCn}a-MpLj<V-$&*|F1Wr>V1mqhY{Ra-Dw_9ZeTm>Pufp<rNFYTP&IdQJS`2
zI`(x}82%<NDOBrgE%~cSY!nBsE<qEH^i`YPtrIqP@A;i%bZle$l<-UjB@s{4ZOVE^
zP(?5EW=ne6?lwwoW8f-<^DIZ<c|cS23(vZ(;=9Nai8qhMeF|ZaHI-vuRDYX1%j3%I
z)36R}pLstpL7gcQ6!X;OZ8O;&D@6(NQ@3BoE=?`=+RIMVWQS1mV+OjW<F}8~>*K5^
zd2NGPs!K=9Z$&wjyAJkQf6OU|i=&T)tY!9Gb||%2E7#?YrAp$3;k?ji^zED#h5IdY
zKJX`EujHO(dP*A7xOWQoSu2$bBDuPn6`6bD7snULDwpjU%HBMi`}DBQQD03u{xM-G
z?jMg{9<!2dD44L;Wd@B*iz9UxF7E1J!l)zCRdeyNS2*F8J<0fF7Aw&3fN8scnC>Pe
zSKoZ>4&T-HR#1Ho(_>-n(=8EK>ou3kYQr?PB{uik1-gC<idjDB1f>fbvK-zBLKM%6
zNW=2B<Bz8YD&G#5`y?=vi!bxKsx{wSc^6zi%iZcC`lHl9FJr&>ShQK_>2I>nN}9^`
zhx|Nu;Rz6E19g<fR~Igp@-5KEyOgoZ8aPA-GQuYVH3%x&wHoqu072+A61e66{|{`@
z0zn9`6df(4!rj`y5XrB`SOcEZ1~kN2h^7k3@E8TGgkQ9Q783SjKtf*&72sA9Fa!y(
znFRD<{ts^W!AwNdjzzSg0~y#O1ASPR3Pj0ZEwrZqCHOB9C?LNNpr;4d!#8AX+v#6y
zqyv;;=X&tdQvtCXgg1161rjs}B|2EonL)ICL<{<8VHMuGKpp8DhKF<k9SI+Ujk>@N
z$sa?nz14sVSO9H%r$og4JfxK6)O&BClOAwI@RO+77ZrF>4_iw6#lw1F6Vf#GbH0HB
z%#qPg7;D313YO8B#aJI6Qp29^PQt|AQ!w=d^KgLzY!Ti(`uBIWUqS&?Oi1QCJW2&y
g@ysP0Y^4GVd^!f-slZqv1{Z@nO2Xmx;{hi1A39^Z9smFU
diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Module.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Module.php
index c1b425660..7228ddf71 100644
--- a/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Module.php
+++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/models/Module.php
@@ -32,7 +32,7 @@ class PBXManager_Module_Model extends Vtiger_Module_Model {
public function getModuleBasicLinks() {
$basicLinks = parent::getModuleBasicLinks();
foreach ($basicLinks as $key => $basicLink) {
- if ($basicLink['linklabel'] == 'LBL_ADD_RECORD') {
+ if (in_array($basicLink['linklabel'], array('LBL_ADD_RECORD', 'LBL_IMPORT'))) {
unset($basicLinks[$key]);
}
}
@@ -47,27 +47,31 @@ class PBXManager_Module_Model extends Vtiger_Module_Model {
if(!$this->isEntityModule()) {
return array();
}
- vimport('~~modules/com_vtiger_workflow/VTWorkflowUtils.php');
- $layoutEditorImagePath = Vtiger_Theme::getImagePath('LayoutEditor.gif');
- $editWorkflowsImagePath = Vtiger_Theme::getImagePath('EditWorkflows.png');
$settingsLinks = array();
+ $currentUser = Users_Record_Model::getCurrentUserModel();
+ if($currentUser->isAdminUser()) {
+ vimport('~~modules/com_vtiger_workflow/VTWorkflowUtils.php');
+
+ $layoutEditorImagePath = Vtiger_Theme::getImagePath('LayoutEditor.gif');
+ $editWorkflowsImagePath = Vtiger_Theme::getImagePath('EditWorkflows.png');
+
+ if(VTWorkflowUtils::checkModuleWorkflow($this->getName())) {
+ $settingsLinks[] = array(
+ 'linktype' => 'LISTVIEWSETTING',
+ 'linklabel' => 'LBL_EDIT_WORKFLOWS',
+ 'linkurl' => 'index.php?parent=Settings&module=Workflows&view=List&sourceModule='.$this->getName(),
+ 'linkicon' => $editWorkflowsImagePath
+ );
+ }
- if(VTWorkflowUtils::checkModuleWorkflow($this->getName())) {
$settingsLinks[] = array(
- 'linktype' => 'LISTVIEWSETTING',
- 'linklabel' => 'LBL_EDIT_WORKFLOWS',
- 'linkurl' => 'index.php?parent=Settings&module=Workflows&view=List&sourceModule='.$this->getName(),
- 'linkicon' => $editWorkflowsImagePath
+ 'linktype' => 'LISTVIEWSETTINGS',
+ 'linklabel'=> 'LBL_SERVER_CONFIGURATION',
+ 'linkurl' => 'index.php?parent=Settings&module=PBXManager&view=Index',
+ 'linkicon'=> ''
);
}
-
- $settingsLinks[] = array(
- 'linktype' => 'LISTVIEWSETTINGS',
- 'linklabel'=> 'LBL_SERVER_CONFIGURATION',
- 'linkurl' => 'index.php?parent=Settings&module=PBXManager&view=Index',
- 'linkicon'=> ''
- );
return $settingsLinks;
}
diff --git a/pkg/vtiger/modules/PBXManager/modules/PBXManager/views/List.php b/pkg/vtiger/modules/PBXManager/modules/PBXManager/views/List.php
new file mode 100644
index 000000000..3374c9c31
--- /dev/null
+++ b/pkg/vtiger/modules/PBXManager/modules/PBXManager/views/List.php
@@ -0,0 +1,41 @@
+<?php
+/* +**********************************************************************************
+ * The contents of this file are subject to the vtiger CRM Public License Version 1.1
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ * ***********************************************************************************/
+
+class PBXManager_List_View extends Vtiger_List_View {
+
+ function process(Vtiger_Request $request) {
+ $viewer = $this->getViewer($request);
+ $moduleName = $request->getModule();
+ $moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+ $viewName = $request->get('viewname');
+ if ($viewName) {
+ $this->viewName = $viewName;
+ }
+
+ $this->initializeListViewContents($request, $viewer);
+ $this->assignCustomViews($request, $viewer);
+ $viewer->assign('VIEW', $request->get('view'));
+ $viewer->assign('MODULE_MODEL', $moduleModel);
+ $viewer->assign('RECORD_ACTIONS', $this->getRecordActionsFromModule($moduleModel));
+ $viewer->assign('CURRENT_USER_MODEL', Users_Record_Model::getCurrentUserModel());
+
+ $viewer->assign('IS_CREATE_PERMITTED', false);
+ $viewer->assign('IS_MODULE_EDITABLE', false);
+ $viewer->assign('IS_MODULE_DELETABLE', false);
+ $viewer->view('ListViewContents.tpl', $moduleName);
+ }
+
+ public function getRecordActionsFromModule($moduleModel) {
+ $recordActions = array();
+ $recordActions['edit'] = false;
+ $recordActions['delete'] = false;
+ return $recordActions;
+ }
+}
--
GitLab