Merge branch 'Developer'

layouts/vlayout/modules/HelpDesk/dashboards/TicketsByStatus.tpl

@@ -1,13 +1,13 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Barchat_Widget_Js('Vtiger_Ticketsbystatus_Widget_Js',{},{});

layouts/vlayout/modules/Leads/dashboards/LeadsByIndustry.tpl

@@ -1,13 +1,13 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Barchat_Widget_Js('Vtiger_Leadsbyindustry_Widget_Js',{},{});

layouts/vlayout/modules/Leads/dashboards/LeadsBySource.tpl

@@ -1,13 +1,13 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Barchat_Widget_Js('Vtiger_Leadsbysource_Widget_Js',{},{});

layouts/vlayout/modules/Leads/dashboards/LeadsByStatus.tpl

@@ -1,13 +1,13 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Barchat_Widget_Js('Vtiger_Leadsbystatus_Widget_Js',{},{});

layouts/vlayout/modules/Leads/dashboards/LeadsByStatusConverted.tpl

@@ -1,13 +1,13 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Barchat_Widget_Js('Vtiger_Leadsbystatusconverted_Widget_Js',{},{});

layouts/vlayout/modules/Potentials/dashboards/GroupBySalesStage.tpl

@@ -1,17 +1,19 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
 <script type="text/javascript">
 	Vtiger_Funnel_Widget_Js('Vtiger_Groupedbysalesstage_Widget_Js',{},{});
 </script>
+{assign var=ACCESSIBLE_USERS value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_GROUPS value=$CURRENTUSER->getAccessibleGroups()}
 {foreach key=index item=cssModel from=$STYLES}
 	<link rel="{$cssModel->getRel()}" href="{$cssModel->getHref()}" type="{$cssModel->getType()}" media="{$cssModel->getMedia()}" />
 {/foreach}

layouts/vlayout/modules/Vtiger/dashboards/AssignedProjectsTasks.tpl

@@ -1,15 +1,16 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
-{assign var=ALL_ACTIVEUSER_LIST value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_USERS value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_GROUPS value=$CURRENTUSER->getAccessibleGroups()}
 {assign var=CURRENTUSERID value=$CURRENTUSER->getId()}
 <div class="dashboardWidgetHeader">
 	<table width="100%" cellspacing="0" cellpadding="0">

layouts/vlayout/modules/Vtiger/dashboards/CalendarActivities.tpl

@@ -1,15 +1,16 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+**********************************************************************************
+ * 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.
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 -->*}
-{assign var=ALL_ACTIVEUSER_LIST value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_USERS value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_GROUPS value=$CURRENTUSER->getAccessibleGroups()}
 {assign var=CURRENTUSERID value=$CURRENTUSER->getId()}
 <div class="dashboardWidgetHeader">
 	<table width="100%" cellspacing="0" cellpadding="0">

layouts/vlayout/modules/Vtiger/dashboards/MiniList.tpl

@@ -1,12 +1,14 @@
 {************************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * 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.
- *************************************************************************************}
-{assign var=ALL_ACTIVEUSER_LIST value=$CURRENTUSER->getAccessibleUsers()}
+ * Contributor(s): YetiForce.com
+ ************************************************************************************}
+{assign var=ACCESSIBLE_USERS value=$CURRENTUSER->getAccessibleUsers()}
+{assign var=ACCESSIBLE_GROUPS value=$CURRENTUSER->getAccessibleGroups()}
 {assign var=CURRENTUSERID value=$CURRENTUSER->getId()}
 <div class="dashboardWidgetHeader">
 	<table width="100%" cellspacing="0" cellpadding="0">
@@ -17,19 +19,7 @@
 			</th>
 			<th class="span5">
 				<div>
-					<select class="widgetFilter" name="type" style='width:100px;margin-bottom:0px'>
-						<option value="{$CURRENTUSERID}">{vtranslate('LBL_MINE')}</option>
-						<option value="all">{vtranslate('LBL_ALL')}</option>
-						{if $ALL_ACTIVEUSER_LIST}
-							<optgroup label="{vtranslate('LBL_USERS')}">
-								{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST}
-									{if $OWNER_ID neq $CURRENTUSERID}
-										<option value="{$OWNER_ID}">{$OWNER_NAME}</option>
-									{/if}
-								{/foreach}
-							</optgroup>
-						{/if}
-					</select>
+					{include file="dashboards/SelectAccessibleTemplate.tpl"|@vtemplate_path:$MODULE_NAME}
 				</div>
 			</th>
 			<th class="widgeticons" align="right">

layouts/vlayout/modules/Vtiger/dashboards/SelectAccessibleTemplate.tpl

@@ -1,34 +1,34 @@
 {*<!--
-/*********************************************************************************
-  ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-   * ("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.
-  *
- ********************************************************************************/
+/*+***********************************************************************************************************************************
+ * The contents of this file are subject to the YetiForce Public License Version 1.1 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and limitations under the License.
+ * The Original Code is YetiForce.
+ * The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com. 
+ * All Rights Reserved.
+ *************************************************************************************************************************************/
 -->*}
 
 
 	<div>
 		<select class="widgetFilter" id="owner" name="owner" style='width:100px;margin-bottom:0px'>
-			<option value="{$CURRENTUSER->getId()}" >{vtranslate('LBL_MINE')}</option>
+			{if array_key_exists( $CURRENTUSER->getId(), $ACCESSIBLE_USERS )}
+				<option value="{$CURRENTUSER->getId()}" >{vtranslate('LBL_MINE')}</option>
+			{/if}
 			<option value="all">{vtranslate('LBL_ALL')}</option>
-			{assign var=ALL_ACTIVEUSER_LIST value=$CURRENTUSER->getAccessibleUsers()}
-			{if count($ALL_ACTIVEUSER_LIST) gt 1}
+			{if !empty($ACCESSIBLE_USERS)}
 				<optgroup label="{vtranslate('LBL_USERS')}">
-					{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEUSER_LIST}
+					{foreach key=OWNER_ID item=OWNER_NAME from=$ACCESSIBLE_USERS}
 						{if $OWNER_ID neq {$CURRENTUSER->getId()}}
 							<option value="{$OWNER_ID}">{$OWNER_NAME}</option>
 						{/if}
 					{/foreach}
 				</optgroup>
 			{/if}
-			{assign var=ALL_ACTIVEGROUP_LIST value=$CURRENTUSER->getAccessibleGroups()}
-			{if !empty($ALL_ACTIVEGROUP_LIST)}
+			{if !empty($ACCESSIBLE_GROUPS)}
 				<optgroup label="{vtranslate('LBL_GROUPS')}">
-					{foreach key=OWNER_ID item=OWNER_NAME from=$ALL_ACTIVEGROUP_LIST}
+					{foreach key=OWNER_ID item=OWNER_NAME from=$ACCESSIBLE_GROUPS}
 						<option value="{$OWNER_ID}">{$OWNER_NAME}</option>
 					{/foreach}
 				</optgroup>

modules/HelpDesk/dashboards/TicketsByStatus.php

@@ -1,12 +1,13 @@
 <?php
-/*+***********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+/*+**********************************************************************************
+ * 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.
- *************************************************************************************/
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 
 class HelpDesk_TicketsByStatus_Dashboard extends Vtiger_IndexAjax_View {
 
@@ -56,7 +57,9 @@ public function process(Vtiger_Request $request) {
 		$viewer->assign('CURRENTUSER', $currentUser);
 
 		$accessibleUsers = $currentUser->getAccessibleUsersForModule($moduleName);
+		$accessibleGroups = $currentUser->getAccessibleUsersForModule($moduleName);
 		$viewer->assign('ACCESSIBLE_USERS', $accessibleUsers);
+		$viewer->assign('ACCESSIBLE_GROUPS', $accessibleGroups);
 
 		$content = $request->get('content');
 		if(!empty($content)) {

modules/Leads/dashboards/LeadsByIndustry.php

@@ -1,12 +1,13 @@
 <?php
-/*+***********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+/*+**********************************************************************************
+ * 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.
- *************************************************************************************/
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 
 class Leads_LeadsByIndustry_Dashboard extends Vtiger_IndexAjax_View {
 
@@ -57,7 +58,9 @@ public function process(Vtiger_Request $request) {
 		$viewer->assign('CURRENTUSER', $currentUser);
 
 		$accessibleUsers = $currentUser->getAccessibleUsersForModule('Leads');
+		$accessibleGroups = $currentUser->getAccessibleUsersForModule('Leads');
 		$viewer->assign('ACCESSIBLE_USERS', $accessibleUsers);
+		$viewer->assign('ACCESSIBLE_GROUPS', $accessibleGroups);
 
 		$content = $request->get('content');
 		if(!empty($content)) {

modules/Leads/dashboards/LeadsBySource.php

@@ -1,12 +1,13 @@
 <?php
-/*+***********************************************************************************
- * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+/*+**********************************************************************************
+ * 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.
- *************************************************************************************/
+ * Contributor(s): YetiForce.com
+ ************************************************************************************/
 
 class Leads_LeadsBySource_Dashboard extends Vtiger_IndexAjax_View {
 
@@ -56,7 +57,9 @@ public function process(Vtiger_Request $request) {
 		$viewer->assign('CURRENTUSER', $currentUser);
 
 		$accessibleUsers = $currentUser->getAccessibleUsersForModule('Leads');
+		$accessibleGroups = $currentUser->getAccessibleUsersForModule('Leads');
 		$viewer->assign('ACCESSIBLE_USERS', $accessibleUsers);
+		$viewer->assign('ACCESSIBLE_GROUPS', $accessibleGroups);
 		$content = $request->get('content');
 		if(!empty($content)) {
 			$viewer->view('dashboards/DashBoardWidgetContents.tpl', $moduleName);