Menu
▾
▴
openutils-svn
|
From: <mol...@us...> - 2009-08-21 14:26:13
|
Revision: 1283
http://openutils.svn.sourceforge.net/openutils/?rev=1283&view=rev
Author: molaschi
Date: 2009-08-21 14:26:05 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
MEDIA-8 removed publishing limitation to media-publish role
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-20 14:00:13 UTC (rev 1282)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:26:05 UTC (rev 1283)
@@ -194,13 +194,10 @@
if (!MediaModule.getInstance().isAutoactivate())
{
- if (MgnlContext.getUser().hasRole("media-publish") || MgnlContext.getUser().hasRole("superuser"))
- {
- tree.addSeparator();
- tree.addMenuItem(menuActivateExcl);
- tree.addMenuItem(menuActivate);
- tree.addMenuItem(menuDeactivate);
- }
+ tree.addSeparator();
+ tree.addMenuItem(menuActivateExcl);
+ tree.addMenuItem(menuActivate);
+ tree.addMenuItem(menuDeactivate);
}
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-08-21 14:43:46
|
Revision: 1285
http://openutils.svn.sourceforge.net/openutils/?rev=1285&view=rev
Author: molaschi
Date: 2009-08-21 14:43:38 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
MEDIA-8 add javascript condition to check write permission for operations that makes an update on current node (new folder, new media, upload zip, cut, paste) and for activate/deactivate ops
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:37:24 UTC (rev 1284)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:43:38 UTC (rev 1285)
@@ -65,6 +65,9 @@
menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotContentNode(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
+ menuNewPage.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
List<ContextMenuItem> menusNewMedia = new ArrayList<ContextMenuItem>();
@@ -100,6 +103,9 @@
menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotRoot(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
+ menuDelete.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
ContextMenuItem menuCopy = new ContextMenuItem("copy");
menuCopy.setLabel(msgs.get("tree.config.menu.copy")); //$NON-NLS-1$
@@ -121,6 +127,8 @@
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
menuCut.setOnclick(tree.getJavascriptTree() + ".cutNode();"); //$NON-NLS-1$
+ menuCut
+ .addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite(" + tree.getJavascriptTree() + ")");
ContextMenuItem menuActivateExcl = new ContextMenuItem("activate");
menuActivateExcl.setLabel(msgs.get("tree.config.menu.activate")); //$NON-NLS-1$
@@ -132,6 +140,9 @@
menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
+ menuActivateExcl.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
ContextMenuItem menuActivate = new ContextMenuItem("activateInclSubs");
menuActivate.setLabel(msgs.get("tree.config.menu.activateInclSubs")); //$NON-NLS-1$
@@ -143,6 +154,9 @@
menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
+ menuActivate.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
ContextMenuItem menuDeactivate = new ContextMenuItem("deactivate");
menuDeactivate.setLabel(msgs.get("tree.config.menu.deactivate")); //$NON-NLS-1$
@@ -154,6 +168,9 @@
menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionSelectedNotNodeData(" //$NON-NLS-1$
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
+ menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
ContextMenuItem menuLoadZip = new ContextMenuItem("loadzip");
menuLoadZip.setLabel(msgs.get("media.loadzip")); //$NON-NLS-1$
@@ -164,6 +181,9 @@
+ tree.getJavascriptTree()
+ ")"); //$NON-NLS-1$
menuLoadZip.setOnclick("parent.uploadzip(" + tree.getJavascriptTree() + ");"); //$NON-NLS-1$
+ menuLoadZip.addJavascriptCondition("new mgnlTreeMenuItemConditionPermissionWrite("
+ + tree.getJavascriptTree()
+ + ")");
// is it possible to activate?
if (!ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-08-21 14:46:06
|
Revision: 1286
http://openutils.svn.sourceforge.net/openutils/?rev=1286&view=rev
Author: molaschi
Date: 2009-08-21 14:45:54 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
MEDIA-7 removed check for "browse mode" to filter out context menu items on folders
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:43:38 UTC (rev 1285)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 14:45:54 UTC (rev 1286)
@@ -193,37 +193,32 @@
menuDeactivate.addJavascriptCondition("new mgnlTreeMenuItemConditionBoolean(false)"); //$NON-NLS-1$
}
- if (!browseMode && request.getParameter("selectMedia") == null)
+ tree.addMenuItem(menuNewPage);
+
+ for (ContextMenuItem it : menusNewMedia)
{
- tree.addMenuItem(menuNewPage);
+ tree.addMenuItem(it);
+ }
- for (ContextMenuItem it : menusNewMedia)
- {
- tree.addMenuItem(it);
- }
+ tree.addSeparator();
+ tree.addMenuItem(menuLoadZip);
- tree.addSeparator();
- tree.addMenuItem(menuLoadZip);
+ tree.addSeparator();
+ tree.addMenuItem(menuDelete);
- tree.addSeparator();
- tree.addMenuItem(menuDelete);
+ tree.addSeparator();
+ tree.addMenuItem(menuCut);
+ tree.addMenuItem(menuCopy);
+ if (!MediaModule.getInstance().isAutoactivate())
+ {
tree.addSeparator();
- tree.addMenuItem(menuCut);
- tree.addMenuItem(menuCopy);
-
- if (!MediaModule.getInstance().isAutoactivate())
- {
- tree.addSeparator();
- tree.addMenuItem(menuActivateExcl);
- tree.addMenuItem(menuActivate);
- tree.addMenuItem(menuDeactivate);
- }
+ tree.addMenuItem(menuActivateExcl);
+ tree.addMenuItem(menuActivate);
+ tree.addMenuItem(menuDeactivate);
}
- else
- {
- tree.addMenuItem(ContextMenuItem.getRefreshMenuItem(tree, msgs, request));
- }
+
+ tree.addMenuItem(ContextMenuItem.getRefreshMenuItem(tree, msgs, request));
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-08-21 15:12:38
|
Revision: 1292
http://openutils.svn.sourceforge.net/openutils/?rev=1292&view=rev
Author: molaschi
Date: 2009-08-21 15:12:31 +0000 (Fri, 21 Aug 2009)
Log Message:
-----------
organize import
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 15:11:26 UTC (rev 1291)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 15:12:31 UTC (rev 1292)
@@ -24,7 +24,6 @@
import info.magnolia.cms.gui.control.Tree;
import info.magnolia.cms.gui.control.TreeColumn;
import info.magnolia.cms.i18n.Messages;
-import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.AbstractTreeConfiguration;
import java.util.ArrayList;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mol...@us...> - 2009-08-24 10:16:54
|
Revision: 1294
http://openutils.svn.sourceforge.net/openutils/?rev=1294&view=rev
Author: molaschi
Date: 2009-08-24 10:16:47 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
MEDIA-7 when selecting a media show status column
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-21 15:13:14 UTC (rev 1293)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2009-08-24 10:16:47 UTC (rev 1294)
@@ -247,7 +247,7 @@
tree.addColumn(column0);
- if (!browseMode && request.getParameter("selectMedia") == null)
+ if (!browseMode)
{
if (ServerConfiguration.getInstance().isAdmin()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-02-03 10:09:25
|
Revision: 1785
http://openutils.svn.sourceforge.net/openutils/?rev=1785&view=rev
Author: diego_schivo
Date: 2010-02-03 10:09:18 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
MEDIA-54 Single-instance configuration: Folders have the "unactivated icon", we should remove the column
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-03 09:46:19 UTC (rev 1784)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tree/MediaModuleTreeConfiguration.java 2010-02-03 10:09:18 UTC (rev 1785)
@@ -255,7 +255,7 @@
tree.addColumn(column0);
- if (!browseMode)
+ if (!browseMode && !MediaModule.getInstance().isAutoactivate())
{
if (ServerConfiguration.getInstance().isAdmin()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X