[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7016] admin: fix confirm_delete and remove menuentry
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7016] admin: fix confirm_delete and remove menuentry for slow alternative cacheremoval |
Date: |
Thu, 17 Feb 2011 08:32:38 +0000 |
Revision: 7016
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7016
Author: sigurdne
Date: 2011-02-17 08:32:37 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
admin: fix confirm_delete and remove menuentry for slow alternative cacheremoval
Modified Paths:
--------------
trunk/admin/inc/class.menu.inc.php
trunk/admin/templates/base/confirm_delete.xsl
Modified: trunk/admin/inc/class.menu.inc.php
===================================================================
--- trunk/admin/inc/class.menu.inc.php 2011-02-16 15:16:04 UTC (rev 7015)
+++ trunk/admin/inc/class.menu.inc.php 2011-02-17 08:32:37 UTC (rev 7016)
@@ -96,6 +96,7 @@
);
}
+/*
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['clear_user_cache'] = array
@@ -104,7 +105,7 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiaccounts.clear_user_cache') )
);
}
-
+*/
if ( $GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
{
$menus['admin']['clear_cache'] = array
Modified: trunk/admin/templates/base/confirm_delete.xsl
===================================================================
--- trunk/admin/templates/base/confirm_delete.xsl 2011-02-16 15:16:04 UTC
(rev 7015)
+++ trunk/admin/templates/base/confirm_delete.xsl 2011-02-17 08:32:37 UTC
(rev 7016)
@@ -34,14 +34,18 @@
</xsl:when>
</xsl:choose>
<input type="submit" name="cancel"
value="{lang_no}" title="{lang_no_statustext}"/>
-
<xsl:choose>
- <xsl:when test="show_done = ''">
+ <xsl:when test="show_done">
+ <xsl:choose>
+ <xsl:when
test="show_done = ''">
+ <input
type="submit" name="confirm" value="{lang_yes}" title="{lang_yes_statustext}"/>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
<input type="submit"
name="confirm" value="{lang_yes}" title="{lang_yes_statustext}"/>
- </xsl:when>
+ </xsl:otherwise>
</xsl:choose>
-
-
</form>
</div>
</xsl:template>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7016] admin: fix confirm_delete and remove menuentry for slow alternative cacheremoval,
Sigurd Nes <=