[Vtigercrm-commits] [vtiger-commits] r9101 - in /vtigercrm/trunk/modules/HelpDesk: CallRelatedList.php DetailView.php HelpDesk.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Aug 24 01:21:42 EDT 2006
Author: richie
Date: Wed Aug 23 23:21:26 2006
New Revision: 9101
Log:
Updated the single pane view feature for detailview in HelpDesk Module -- ahmed
Modified:
vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
vtigercrm/trunk/modules/HelpDesk/DetailView.php
vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
Modified: vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/CallRelatedList.php Wed Aug 23 23:21:26 2006
@@ -50,8 +50,7 @@
$category = getParentTab();
$smarty->assign("CATEGORY",$category);
-$smarty->assign("id",$focus->id);
-$smarty->assign("ID",$RECORD );
+$smarty->assign("ID",$focus->id);
$smarty->assign("MODULE",$currentmodule);
$smarty->assign("SINGLE_MOD",$app_strings['Ticket']);
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
Modified: vtigercrm/trunk/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/DetailView.php Wed Aug 23 23:21:26 2006
@@ -1,109 +1,119 @@
-<?php
-/*********************************************************************************
-** 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.
-*
- ********************************************************************************/
-
-require_once('include/database/PearDatabase.php');
-require_once('Smarty_setup.php');
-require_once('modules/HelpDesk/HelpDesk.php');
-require_once('include/utils/utils.php');
-
-$focus = new HelpDesk();
-
-if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
-{
- $focus->retrieve_entity_info($_REQUEST['record'],"HelpDesk");
- $focus->name=$focus->column_fields['ticket_title'];
-}
-
-if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
-{
- $focus->id = "";
-}
-
-//Added code for Error display in sending mail to assigned to user when ticket is created or updated.
-if($_REQUEST['mail_error'] != '')
-{
- require_once("modules/Emails/mail.php");
- echo parseEmailErrorString($_REQUEST['mail_error']);
-}
-
-global $app_strings;
-global $mod_strings;
-global $currentModule;
-
-global $theme;
-$theme_path="themes/".$theme."/";
-$image_path=$theme_path."images/";
-require_once($theme_path.'layout_utils.php');
-
-$smarty = new vtigerCRM_Smarty;
-$smarty->assign("MOD", $mod_strings);
-$smarty->assign("APP", $app_strings);
-
-if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
-else $smarty->assign("NAME", "");
-$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
-$smarty->assign("TICKETID", $_REQUEST['record']);
-
-$smarty->assign("CUSTOMFIELD", $cust_fld);
-$smarty->assign("SINGLE_MOD", 'HelpDesk');
-$category = getParentTab();
-$smarty->assign("CATEGORY",$category);
-$smarty->assign("UPDATEINFO",updateInfo($_REQUEST['record']));
-
-if(isPermitted("HelpDesk","EditView",$_REQUEST['record']) == 'yes')
- $smarty->assign("EDIT_DUPLICATE","permitted");
-
-if(isPermitted("HelpDesk","Delete",$_REQUEST['record']) == 'yes')
- $smarty->assign("DELETE","permitted");
-
-//Added button for Convert the ticket to FAQ
-if(isPermitted("Faq","EditView",'') == 'yes')
- $smarty->assign("CONVERTASFAQ","permitted");
-
-$smarty->assign("IMAGE_PATH", $image_path);
-$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
-$smarty->assign("ID", $_REQUEST['record']);
-if(isPermitted("HelpDesk","Merge",'') == 'yes')
-{
- $smarty->assign("MERGEBUTTON","permitted");
- require_once('include/utils/UserInfoUtil.php');
- $wordTemplateResult = fetchWordTemplateList("HelpDesk");
- $tempCount = $adb->num_rows($wordTemplateResult);
- $tempVal = $adb->fetch_array($wordTemplateResult);
- for($templateCount=0;$templateCount<$tempCount;$templateCount++)
- {
- $optionString[$tempVal["templateid"]]=$tempVal["filename"];
- $tempVal = $adb->fetch_array($wordTemplateResult);
- }
- $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
- $smarty->assign("TOPTIONS",$optionString);
-}
-
-$check_button = Button_Check($module);
-$smarty->assign("CHECK", $check_button);
-
-$tabid = getTabid("HelpDesk");
-$validationData = getDBValidationData($focus->tab_name,$tabid);
-$data = split_validationdataArray($validationData);
-$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
-$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
-$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
-
-//Added to display the ticket comments information
-$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
-
-$smarty->assign("MODULE",$currentModule);
-$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
-$smarty->display("DetailView.tpl");
-$focus->id = $_REQUEST['record'];
-
-
-?>
+<?php
+/*********************************************************************************
+** 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.
+*
+ ********************************************************************************/
+
+require_once('include/database/PearDatabase.php');
+require_once('Smarty_setup.php');
+require_once('modules/HelpDesk/HelpDesk.php');
+require_once('include/utils/utils.php');
+require_once('user_privileges/default_module_view.php');
+
+$focus = new HelpDesk();
+
+if(isset($_REQUEST['record']) && isset($_REQUEST['record']))
+{
+ $focus->retrieve_entity_info($_REQUEST['record'],"HelpDesk");
+ $focus->name=$focus->column_fields['ticket_title'];
+}
+
+if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
+{
+ $focus->id = "";
+}
+
+//Added code for Error display in sending mail to assigned to user when ticket is created or updated.
+if($_REQUEST['mail_error'] != '')
+{
+ require_once("modules/Emails/mail.php");
+ echo parseEmailErrorString($_REQUEST['mail_error']);
+}
+
+global $app_strings;
+global $mod_strings;
+global $currentModule, $singlepane_view;
+
+global $theme;
+$theme_path="themes/".$theme."/";
+$image_path=$theme_path."images/";
+require_once($theme_path.'layout_utils.php');
+
+$smarty = new vtigerCRM_Smarty;
+$smarty->assign("MOD", $mod_strings);
+$smarty->assign("APP", $app_strings);
+
+$focus->id = $_REQUEST['record'];
+if (isset($focus->name)) $smarty->assign("NAME", $focus->name);
+else $smarty->assign("NAME", "");
+$smarty->assign("BLOCKS", getBlocks($currentModule,"detail_view",'',$focus->column_fields));
+$smarty->assign("TICKETID", $_REQUEST['record']);
+
+$smarty->assign("CUSTOMFIELD", $cust_fld);
+$smarty->assign("SINGLE_MOD", 'HelpDesk');
+$category = getParentTab();
+$smarty->assign("CATEGORY",$category);
+$smarty->assign("UPDATEINFO",updateInfo($_REQUEST['record']));
+
+if(isPermitted("HelpDesk","EditView",$_REQUEST['record']) == 'yes')
+ $smarty->assign("EDIT_DUPLICATE","permitted");
+
+if(isPermitted("HelpDesk","Delete",$_REQUEST['record']) == 'yes')
+ $smarty->assign("DELETE","permitted");
+
+//Added button for Convert the ticket to FAQ
+if(isPermitted("Faq","EditView",'') == 'yes')
+ $smarty->assign("CONVERTASFAQ","permitted");
+
+$smarty->assign("IMAGE_PATH", $image_path);
+$smarty->assign("PRINT_URL", "phprint.php?jt=".session_id().$GLOBALS['request_string']);
+$smarty->assign("ID", $_REQUEST['record']);
+if(isPermitted("HelpDesk","Merge",'') == 'yes')
+{
+ $smarty->assign("MERGEBUTTON","permitted");
+ require_once('include/utils/UserInfoUtil.php');
+ $wordTemplateResult = fetchWordTemplateList("HelpDesk");
+ $tempCount = $adb->num_rows($wordTemplateResult);
+ $tempVal = $adb->fetch_array($wordTemplateResult);
+ for($templateCount=0;$templateCount<$tempCount;$templateCount++)
+ {
+ $optionString[$tempVal["templateid"]]=$tempVal["filename"];
+ $tempVal = $adb->fetch_array($wordTemplateResult);
+ }
+ $smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
+ $smarty->assign("TOPTIONS",$optionString);
+}
+
+$check_button = Button_Check($module);
+$smarty->assign("CHECK", $check_button);
+
+$tabid = getTabid("HelpDesk");
+$validationData = getDBValidationData($focus->tab_name,$tabid);
+$data = split_validationdataArray($validationData);
+$smarty->assign("VALIDATION_DATA_FIELDNAME",$data['fieldname']);
+$smarty->assign("VALIDATION_DATA_FIELDDATATYPE",$data['datatype']);
+$smarty->assign("VALIDATION_DATA_FIELDLABEL",$data['fieldlabel']);
+
+//Added to display the ticket comments information
+$smarty->assign("COMMENT_BLOCK",$focus->getCommentInformation($_REQUEST['record']));
+
+$smarty->assign("MODULE",$currentModule);
+$smarty->assign("EDIT_PERMISSION",isPermitted($currentModule,'EditView',$_REQUEST[record]));
+
+if($singlepane_view == 'true')
+{
+ $related_array = getRelatedLists($currentModule,$focus);
+ $smarty->assign("RELATEDLISTS", $related_array);
+}
+
+$smarty->assign("SinglePane_View", $singlepane_view);
+
+$smarty->display("DetailView.tpl");
+
+
+?>
Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.php Wed Aug 23 23:21:26 2006
@@ -18,7 +18,7 @@
require_once('data/SugarBean.php');
require_once('data/CRMEntity.php');
require_once('include/utils/utils.php');
-
+require_once('user_privileges/default_module_view.php');
class HelpDesk extends CRMEntity {
var $log;
@@ -119,7 +119,7 @@
**/
function get_activities($id)
{
- global $log;
+ global $log, $singlepane_view;
$log->debug("Entering get_activities(".$id.") method ...");
global $mod_strings;
global $app_strings;
@@ -128,7 +128,10 @@
$button = '';
- $returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
+ if($singlepane_view == 'true')
+ $returnset = '&return_module=HelpDesk&return_action=DetailView&return_id='.$id;
+ else
+ $returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
$query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
$log->debug("Exiting get_activities method ...");
@@ -350,14 +353,14 @@
global $log,$current_user;
$log->debug("Entering getColumnNames_Hd() method ...");
require('user_privileges/user_privileges_'.$current_user->id.'.php');
- if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
- {
- $sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 30 ";
+ if($is_admin == true || $profileGlobalPermission[1] == 0 || $profileGlobalPermission[2] == 0)
+ {
+ $sql1 = "select fieldlabel from vtiger_field where tabid=13 and block <> 30 ";
}else
{
- $profileList = getCurrentUserProfileList();
- $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=13 and vtiger_field.block <> 30 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
- }
+ $profileList = getCurrentUserProfileList();
+ $sql1 = "select fieldlabel from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=13 and vtiger_field.block <> 30 and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList;
+ }
$result = $this->db->query($sql1);
$numRows = $this->db->num_rows($result);
for($i=0; $i < $numRows;$i++)
More information about the vtigercrm-commits
mailing list