Return-Path: <_www@dev.magnolia.info> Received: from dev.magnolia.info ([213.173.174.20] verified) by mail.obinary.com (CommuniGate Pro SMTP 5.1.10) with ESMTP id 14575726 for svn-list@magnolia.info; Tue, 22 Jul 2008 20:55:27 +0200 Received: by dev.magnolia.info (Postfix, from userid 70) id 965A66B7001; Tue, 22 Jul 2008 20:55:27 +0200 (CEST) MIME-Version: 1.0 X-Mailer: SVN::Notify 2.70: http://search.cpan.org/dist/SVN-Notify/ From: svn@magnolia.info Errors-To: svn@magnolia.info To: svn-list@magnolia.info Subject: [16968] MGNLDATA-38 : fixed deactivation js method name and now only displays status on author instances Reply-To: dev-list@magnolia.info Content-Type: text/html; charset=UTF-8 Message-Id: <20080722185527.965A66B7001@dev.magnolia.info> Date: Tue, 22 Jul 2008 20:55:27 +0200 (CEST) Content-Transfer-Encoding: quoted-printable [16968] MGNLDATA-38 : fixed deactivation js method name and now on= ly displays status on author instances
Revision
16968
Author
gjoseph
Date
2008-07-22 20:55:27 +0200 (Tue, 22 Jul 2008)

Log Message

MGNLDATA-38=
 : fixed deactivation js method name and now only displays status on =
author instances

Modified Paths

Diff

Modified: modules/community/magnolia-module-da= ta/trunk/src/main/java/info/magnolia/module/data/trees/TypeAdminTreeConfi= g.java (16967 =3D> 16968)


--- modules/community/magnolia-module-data/trunk/src=
/main/java/info/magnolia/module/data/trees/TypeAdminTreeConfig.java	2008-=
07-22 17:06:38 UTC (rev 16967)
+++ modules/community/magnolia-module-data/trunk/src/main/java/info/magno=
lia/module/data/trees/TypeAdminTreeConfig.java	2008-07-22 18:55:27 UTC (r=
ev 16968)
@@ -99,8 +99,10 @@
=20
         tree.addColumn(colName);
         tree.addColumn(colTitle);
+        if (isAdminInstance() || hasAnyActiveSubscriber()) {
+            tree.addColumn(columnIcons);
+        }
         tree.addColumn(colDate);
-        tree.addColumn(columnIcons);
=20
     }
=20
@@ -169,7 +171,7 @@
         ContextMenuItem menuDeActivate =3D new=
 ContextMenuItem("deactivate");
         menuDeActivate.setLabel(msgs.get("=
;tree.config.menu.deactivate")); //$NON-NLS-1$
         menuDeActivate.setIcon(request.getCont=
extPath() + "/.resources/icons/16/arrow_left_red.gif"); //$NON-=
NLS-1$
-        menuDeActivate.setOnclick(tree.getJavascriptTree() +=
 ".dea ctivateNode(" + Tree.ACTION_DEACTIVATE + ");")=
; //$NON-NLS-1$ //$NON-NLS-2$
+        menuDeActivate.setOnclick(tree.getJavascriptTree() + =
".deactivateNode(" + Tree.ACTION_DEACTIVATE + ");"); =
//$NON-NLS-1$ //$NON-NLS-2$
         menuDeActivate.addJavascriptCondition(&=
quot;new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
             + tree.getJavascriptTree()
             + ")"); //$NON-NLS-1$