[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin inc/class.uiaccounts.inc.php templates/ba...
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] admin inc/class.uiaccounts.inc.php templates/ba... |
Date: |
Tue, 05 Sep 2006 12:32:21 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Changes by: Dave Hall <skwashd> 06/09/05 12:32:21
Modified files:
inc : class.uiaccounts.inc.php
templates/base : app_data.xsl
Log message:
fix account_id properly
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiaccounts.inc.php?cvsroot=phpgroupware&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/admin/templates/base/app_data.xsl?cvsroot=phpgroupware&r1=1.3&r2=1.4
Patches:
Index: inc/class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- inc/class.uiaccounts.inc.php 5 Sep 2006 10:04:01 -0000 1.64
+++ inc/class.uiaccounts.inc.php 5 Sep 2006 12:32:21 -0000 1.65
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uiaccounts.inc.php,v 1.64 2006/09/05 10:04:01 skwashd Exp
$ */
+ /* $Id: class.uiaccounts.inc.php,v 1.65 2006/09/05 12:32:21 skwashd Exp
$ */
class uiaccounts
{
@@ -963,6 +963,7 @@
(
'account_id' =>
$_REQUEST['account_id'],
'accountlist' => $alist,
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccounts.delete_user') ),
'lang_new_owner' => lang('Who
would you like to transfer ALL records owned by the deleted user to?'),
'l_cancel' =>
lang('cancel'),
'l_delete' =>
lang('delete')
Index: templates/base/app_data.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/admin/templates/base/app_data.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- templates/base/app_data.xsl 5 Sep 2006 11:21:12 -0000 1.3
+++ templates/base/app_data.xsl 5 Sep 2006 12:32:21 -0000 1.4
@@ -1,4 +1,4 @@
-<!-- $Id: app_data.xsl,v 1.3 2006/09/05 11:21:12 sigurdne Exp $ -->
+<!-- $Id: app_data.xsl,v 1.4 2006/09/05 12:32:21 skwashd Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -115,11 +115,9 @@
<!-- BEGIN newOwnerList -->
<xsl:template match="new_owner_list">
- <xsl:variable name="delete_id" select="delete_id"/>
- <xsl:variable name="l_cancel" select="l_cancel"/>
<xsl:variable name="l_delete" select="l_delete"/>
<form method="post">
- <input type="hidden" name="deleteID"
value="{$delete_id}" />
+ <input type="hidden" name="account_id"
value="{account_id}" />
<table style="text-align: center">
<tr>
<td colspan="2">
@@ -135,10 +133,10 @@
</tr>
<tr>
<td>
- <input type="submit"
name="deleteAccount" value="{$l_delete}" />
+ <input type="submit"
name="deleteAccount" value="{l_delete}" />
</td>
<td>
- <input type="submit"
name="cancel" value="{$l_cancel}" />
+ <input type="submit"
name="cancel" value="{l_cancel}" />
</td>
</tr>
</table>
@@ -146,7 +144,6 @@
</xsl:template>
<xsl:template match="accountlist">
- <xsl:variable name="account_id" select="account_id"/>
- <option value="{$account_id}"><xsl:value-of
select="account_name"/></option>
+ <option value="{account_id}"><xsl:value-of
select="account_name"/></option>
</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin inc/class.uiaccounts.inc.php templates/ba...,
Dave Hall <=