[Vtigercrm-commits] [vtiger-commits] r4324 - in /vtigercrm/trunk/modules: Accounts/ Campaigns/ Contacts/ Faq/ HelpDesk/ Invoice/ Notes/ Potentials/ PriceBooks/ Products/ PurchaseOrder/ Quotes/ SalesOrder/ Users/ Vendors/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Mar 20 05:16:26 EST 2006
Author: saraj
Date: Mon Mar 20 03:15:28 2006
New Revision: 4324
Log:
massdelete ajaxified for all modules
Modified:
vtigercrm/trunk/modules/Accounts/Account.js
vtigercrm/trunk/modules/Accounts/AccountsAjax.php
vtigercrm/trunk/modules/Accounts/ListView.php
vtigercrm/trunk/modules/Campaigns/Campaign.js
vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php
vtigercrm/trunk/modules/Campaigns/ListView.php
vtigercrm/trunk/modules/Contacts/Contact.js
vtigercrm/trunk/modules/Contacts/ContactsAjax.php
vtigercrm/trunk/modules/Contacts/ListView.php
vtigercrm/trunk/modules/Faq/Faq.js
vtigercrm/trunk/modules/Faq/FaqAjax.php
vtigercrm/trunk/modules/Faq/ListView.php
vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php
vtigercrm/trunk/modules/HelpDesk/ListView.php
vtigercrm/trunk/modules/Invoice/Invoice.js
vtigercrm/trunk/modules/Invoice/InvoiceAjax.php
vtigercrm/trunk/modules/Invoice/ListView.php
vtigercrm/trunk/modules/Notes/ListView.php
vtigercrm/trunk/modules/Notes/Note.js
vtigercrm/trunk/modules/Notes/NotesAjax.php
vtigercrm/trunk/modules/Potentials/ListView.php
vtigercrm/trunk/modules/Potentials/Opportunity.js
vtigercrm/trunk/modules/Potentials/PotentialsAjax.php
vtigercrm/trunk/modules/PriceBooks/ListView.php
vtigercrm/trunk/modules/PriceBooks/PriceBook.js
vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php
vtigercrm/trunk/modules/Products/ListView.php
vtigercrm/trunk/modules/Products/Product.js
vtigercrm/trunk/modules/Products/ProductsAjax.php
vtigercrm/trunk/modules/PurchaseOrder/ListView.php
vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js
vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php
vtigercrm/trunk/modules/Quotes/ListView.php
vtigercrm/trunk/modules/Quotes/Quote.js
vtigercrm/trunk/modules/Quotes/QuotesAjax.php
vtigercrm/trunk/modules/SalesOrder/ListView.php
vtigercrm/trunk/modules/SalesOrder/SalesOrder.js
vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php
vtigercrm/trunk/modules/Users/massdelete.php
vtigercrm/trunk/modules/Vendors/ListView.php
vtigercrm/trunk/modules/Vendors/Vendor.js
vtigercrm/trunk/modules/Vendors/VendorsAjax.php
Modified: vtigercrm/trunk/modules/Accounts/Account.js
==============================================================================
--- vtigercrm/trunk/modules/Accounts/Account.js (original)
+++ vtigercrm/trunk/modules/Accounts/Account.js Mon Mar 20 03:15:28 2006
@@ -189,7 +189,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Accounts&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Accounts&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Accounts/AccountsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/AccountsAjax.php (original)
+++ vtigercrm/trunk/modules/Accounts/AccountsAjax.php Mon Mar 20 03:15:28 2006
@@ -17,8 +17,11 @@
$local_log =& LoggerManager::getLogger('AccountsAjax');
$ajaxaction = $_REQUEST["ajxaction"];
-
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Accounts/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Accounts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Accounts/ListView.php (original)
+++ vtigercrm/trunk/modules/Accounts/ListView.php Mon Mar 20 03:15:28 2006
@@ -270,7 +270,10 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
-
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Campaigns/Campaign.js
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/Campaign.js (original)
+++ vtigercrm/trunk/modules/Campaigns/Campaign.js Mon Mar 20 03:15:28 2006
@@ -50,7 +50,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Campaigns&return_action=ListView&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Campaigns&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php (original)
+++ vtigercrm/trunk/modules/Campaigns/CampaignsAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Campaigns/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Campaigns/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Campaigns/ListView.php (original)
+++ vtigercrm/trunk/modules/Campaigns/ListView.php Mon Mar 20 03:15:28 2006
@@ -235,5 +235,9 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Contacts/Contact.js
==============================================================================
--- vtigercrm/trunk/modules/Contacts/Contact.js (original)
+++ vtigercrm/trunk/modules/Contacts/Contact.js Mon Mar 20 03:15:28 2006
@@ -209,7 +209,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Contacts&return_action=ListView&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Contacts&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Contacts/ContactsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ContactsAjax.php (original)
+++ vtigercrm/trunk/modules/Contacts/ContactsAjax.php Mon Mar 20 03:15:28 2006
@@ -19,7 +19,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Contacts/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Contacts/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Contacts/ListView.php (original)
+++ vtigercrm/trunk/modules/Contacts/ListView.php Mon Mar 20 03:15:28 2006
@@ -277,6 +277,9 @@
$smarty->assign("MODULE", $currentModule);
$smarty->assign("SINGLE_MOD", 'Contact');
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Faq/Faq.js
==============================================================================
--- vtigercrm/trunk/modules/Faq/Faq.js (original)
+++ vtigercrm/trunk/modules/Faq/Faq.js Mon Mar 20 03:15:28 2006
@@ -50,7 +50,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Faq&return_action=index";
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Faq&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Faq/FaqAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/FaqAjax.php (original)
+++ vtigercrm/trunk/modules/Faq/FaqAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Faq/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Faq/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Faq/ListView.php (original)
+++ vtigercrm/trunk/modules/Faq/ListView.php Mon Mar 20 03:15:28 2006
@@ -152,5 +152,9 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
$smarty->assign("SINGLE_MOD" ,'Faq');
-$smarty->display("ListView.tpl");
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/HelpDesk/HelpDesk.js
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDesk.js (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDesk.js Mon Mar 20 03:15:28 2006
@@ -110,7 +110,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=HelpDesk&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=HelpDesk&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/HelpDeskAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/HelpDesk/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/HelpDesk/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/HelpDesk/ListView.php (original)
+++ vtigercrm/trunk/modules/HelpDesk/ListView.php Mon Mar 20 03:15:28 2006
@@ -248,5 +248,8 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Invoice/Invoice.js
==============================================================================
--- vtigercrm/trunk/modules/Invoice/Invoice.js (original)
+++ vtigercrm/trunk/modules/Invoice/Invoice.js Mon Mar 20 03:15:28 2006
@@ -323,7 +323,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Invoice&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Invoice&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Invoice/InvoiceAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/InvoiceAjax.php (original)
+++ vtigercrm/trunk/modules/Invoice/InvoiceAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Invoice/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Invoice/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/ListView.php (original)
+++ vtigercrm/trunk/modules/Invoice/ListView.php Mon Mar 20 03:15:28 2006
@@ -219,6 +219,9 @@
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Notes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/ListView.php (original)
+++ vtigercrm/trunk/modules/Notes/ListView.php Mon Mar 20 03:15:28 2006
@@ -218,5 +218,8 @@
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Notes/Note.js
==============================================================================
--- vtigercrm/trunk/modules/Notes/Note.js (original)
+++ vtigercrm/trunk/modules/Notes/Note.js Mon Mar 20 03:15:28 2006
@@ -58,7 +58,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Notes&return_action=ListView&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Notes&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Notes/NotesAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Notes/NotesAjax.php (original)
+++ vtigercrm/trunk/modules/Notes/NotesAjax.php Mon Mar 20 03:15:28 2006
@@ -18,6 +18,10 @@
$ajaxaction = $_REQUEST["ajxaction"];
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Notes/'.$_REQUEST['file'].'.php');
+}
if($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
Modified: vtigercrm/trunk/modules/Potentials/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/ListView.php (original)
+++ vtigercrm/trunk/modules/Potentials/ListView.php Mon Mar 20 03:15:28 2006
@@ -247,7 +247,10 @@
$smarty->assign("SELECT_SCRIPT", $view_script);
-$smarty->display("ListView.tpl");
-
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Potentials/Opportunity.js
==============================================================================
--- vtigercrm/trunk/modules/Potentials/Opportunity.js (original)
+++ vtigercrm/trunk/modules/Potentials/Opportunity.js Mon Mar 20 03:15:28 2006
@@ -61,7 +61,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Potentials&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Potentials&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Potentials/PotentialsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Potentials/PotentialsAjax.php (original)
+++ vtigercrm/trunk/modules/Potentials/PotentialsAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Potentials/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/PriceBooks/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/ListView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/ListView.php Mon Mar 20 03:15:28 2006
@@ -182,6 +182,10 @@
$smarty->assign("RECORD_COUNTS", $record_string);
$smarty->assign("SELECT_SCRIPT", $view_script);
$smarty->assign("BUTTONS", $other_text);
-$smarty->display("ListView.tpl");
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/PriceBooks/PriceBook.js
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBook.js (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBook.js Mon Mar 20 03:15:28 2006
@@ -174,6 +174,7 @@
{
x = document.massdelete.selected_id.length;
+ var viewid = document.massdelete.viewname.value;
idstring = "";
if ( x == undefined)
@@ -212,7 +213,12 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
-document.massdelete.action="index.php?module=Users&action=massdelete&return_module=PriceBooks&return_action=index"
+ show("status");
+ alert("in fn")
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=PriceBooks&viewname="+viewid+"&idlist="+idstring;
+ alert(urlstring)
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/PriceBooksAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/PriceBooks/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Products/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ListView.php (original)
+++ vtigercrm/trunk/modules/Products/ListView.php Mon Mar 20 03:15:28 2006
@@ -204,6 +204,9 @@
$smarty->assign("CUSTOMVIEW", $customstrings);
$smarty->assign("BUTTONS", $other_text);
-$smarty->display("ListView.tpl");
-
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Products/Product.js
==============================================================================
--- vtigercrm/trunk/modules/Products/Product.js (original)
+++ vtigercrm/trunk/modules/Products/Product.js Mon Mar 20 03:15:28 2006
@@ -111,7 +111,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
-document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Products&return_action=index&viewname"+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Products&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Products/ProductsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Products/ProductsAjax.php (original)
+++ vtigercrm/trunk/modules/Products/ProductsAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Products/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/PurchaseOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/ListView.php Mon Mar 20 03:15:28 2006
@@ -221,6 +221,9 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
-
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrder.js Mon Mar 20 03:15:28 2006
@@ -279,7 +279,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=PurchaseOrder&return_action=index";
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=PurchaseOrder&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/PurchaseOrderAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/PurchaseOrder/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Quotes/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/ListView.php (original)
+++ vtigercrm/trunk/modules/Quotes/ListView.php Mon Mar 20 03:15:28 2006
@@ -223,5 +223,8 @@
$smarty->assign("NAVIGATION", $navigationOutput);
$smarty->assign("RECORD_COUNTS", $record_string);
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Quotes/Quote.js
==============================================================================
--- vtigercrm/trunk/modules/Quotes/Quote.js (original)
+++ vtigercrm/trunk/modules/Quotes/Quote.js Mon Mar 20 03:15:28 2006
@@ -294,7 +294,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Quotes&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Quotes&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Quotes/QuotesAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/QuotesAjax.php (original)
+++ vtigercrm/trunk/modules/Quotes/QuotesAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Quotes/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/SalesOrder/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/ListView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/ListView.php Mon Mar 20 03:15:28 2006
@@ -232,6 +232,11 @@
$smarty->assign("RECORD_COUNTS", $record_string);
$smarty->assign("CUSTOMVIEW", $customstrings);
$smarty->assign("BUTTONS", $other_text);
-$smarty->display("ListView.tpl");
+
+
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrder.js
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrder.js (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrder.js Mon Mar 20 03:15:28 2006
@@ -287,7 +287,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
-document.massdelete.action="index.php?module=Users&action=massdelete&return_module=SalesOrder&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=SalesOrder&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/SalesOrderAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/SalesOrder/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Mon Mar 20 03:15:28 2006
@@ -38,6 +38,6 @@
header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView&viewname=".$viewid);
}
else
- header("Location: index.php?module=".$returnmodule."&action=index".$smod);
+ header("Location: index.php?module=".$returnmodule."&action=".$returnmodule."Ajax&ajax=delete&file=ListView");
?>
Modified: vtigercrm/trunk/modules/Vendors/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/ListView.php (original)
+++ vtigercrm/trunk/modules/Vendors/ListView.php Mon Mar 20 03:15:28 2006
@@ -187,6 +187,9 @@
$smarty->assign("RECORD_COUNTS", $record_string);
$smarty->assign("BUTTONS", $other_text);
-$smarty->display("ListView.tpl");
+if(isset($_REQUEST['ajax']) && $_REQUEST['ajax'] != '')
+ $smarty->display("ListViewEntries.tpl");
+else
+ $smarty->display("ListView.tpl");
?>
Modified: vtigercrm/trunk/modules/Vendors/Vendor.js
==============================================================================
--- vtigercrm/trunk/modules/Vendors/Vendor.js (original)
+++ vtigercrm/trunk/modules/Vendors/Vendor.js Mon Mar 20 03:15:28 2006
@@ -93,7 +93,10 @@
}
if(confirm("Are you sure you want to delete the selected "+xx+" records ?"))
{
- document.massdelete.action="index.php?module=Users&action=massdelete&return_module=Vendors&return_action=index&viewname="+viewid;
+ show("status");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring ="module=Users&action=massdelete&return_module=Vendors&viewname="+viewid+"&idlist="+idstring;
+ ajaxObj.process("index.php?",urlstring);
}
else
{
Modified: vtigercrm/trunk/modules/Vendors/VendorsAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/VendorsAjax.php (original)
+++ vtigercrm/trunk/modules/Vendors/VendorsAjax.php Mon Mar 20 03:15:28 2006
@@ -18,7 +18,11 @@
$ajaxaction = $_REQUEST["ajxaction"];
-if($ajaxaction == "DETAILVIEW")
+if($_REQUEST['file'] != '')
+{
+ require_once('modules/Vendors/'.$_REQUEST['file'].'.php');
+}
+elseif($ajaxaction == "DETAILVIEW")
{
$crmid = $_REQUEST["recordid"];
$tablename = $_REQUEST["tableName"];
More information about the vtigercrm-commits
mailing list