openutils-svn

[Openutils-svn] SF.net SVN: openutils:[3802] magnoliamodules/trunk/openutils-mgnlmessages

[<die...@us...>]

Revision: 3802
          http://openutils.svn.sourceforge.net/openutils/?rev=3802&view=rev
Author:   diego_schivo
Date:     2012-03-15 10:34:51 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
openutils-mgnlmessages: MagnoliaTemplatingUtilities

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-15 10:32:49 UTC (rev 3801)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-15 10:34:51 UTC (rev 3802)
@@ -83,6 +83,11 @@
       <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>info.magnolia</groupId>
+      <artifactId>magnolia-templating-compatibility</artifactId>
+      <version>${magnolia.version}</version>
+    </dependency>
+    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
       <version>2.1</version>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-15 10:32:49 UTC (rev 3801)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-15 10:34:51 UTC (rev 3802)
@@ -23,6 +23,7 @@
 import info.magnolia.cms.i18n.MessagesManager;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
+import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
 
 import java.text.MessageFormat;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3850] magnoliamodules/trunk/openutils-mgnlmessages

[<die...@us...>]

Revision: 3850
          http://openutils.svn.sourceforge.net/openutils/?rev=3850&view=rev
Author:   diego_schivo
Date:     2012-03-20 16:50:46 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
openutils-mgnlmessages

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-20 16:36:29 UTC (rev 3849)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2012-03-20 16:50:46 UTC (rev 3850)
@@ -83,11 +83,6 @@
       <version>5.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-templating-compatibility</artifactId>
-      <version>${magnolia.version}</version>
-    </dependency>
-    <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
       <version>2.1</version>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-20 16:36:29 UTC (rev 3849)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/el/MessagesEl.java	2012-03-20 16:50:46 UTC (rev 3850)
@@ -19,11 +19,11 @@
 
 package net.sourceforge.openutils.mgnlmessages.el;
 
+import info.magnolia.cms.beans.config.ServerConfiguration;
 import info.magnolia.cms.i18n.I18nContentSupportFactory;
 import info.magnolia.cms.i18n.MessagesManager;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.context.MgnlContext;
-import info.magnolia.module.templating.MagnoliaTemplatingUtilities;
 
 import java.text.MessageFormat;
 
@@ -71,7 +71,7 @@
     public static String messageSimple(String key, Object[] arguments)
     {
         if (MgnlContext.getAggregationState().getMainContent() != null
-            && MagnoliaTemplatingUtilities.getInstance().isEditMode()
+            && (ServerConfiguration.getInstance().isAdmin() && !MgnlContext.getAggregationState().isPreviewMode())
             && MgnlContext.getAggregationState().getMainContent().isGranted(Permission.WRITE)) // equivalent of
                                                                                                // CmsFunctions.canEdit()
         {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.