Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4611] magnoliamodules/trunk/openutils-mgnlmessages/ src/main
|
From: <mol...@us...> - 2015-04-13 14:40:19
|
Revision: 4611
http://openutils.svn.sourceforge.net/openutils/?rev=4611&view=rev
Author: molaschi
Date: 2015-04-13 14:40:17 +0000 (Mon, 13 Apr 2015)
Log Message:
-----------
fix jcr API usage and update jquery UI
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2015-03-05 14:31:16 UTC (rev 4610)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/i18n/RepositoryMessagesImpl.java 2015-04-13 14:40:17 UTC (rev 4611)
@@ -52,7 +52,7 @@
/**
* @author molaschi
- * @version $Id: RepositoryMessagesImpl.java 4465 2008-09-28 10:59:58Z fgiust $
+ * @version $Id: RepositoryMessagesImpl.java 3367 2015-04-10 13:09:11Z davide.bizzozero $
*/
public class RepositoryMessagesImpl extends AbstractMessagesImpl
{
@@ -91,8 +91,8 @@
{
String handle = StringUtils.replace(key, ".", "/");
Session hm = Components.getComponent(SystemContext.class).getJCRSession(
- MessagesConfigurationManager.MESSAGES_REPO);
- Node c = hm.getNode(handle);
+ MessagesConfigurationManager.MESSAGES_REPO);
+ Node c = hm.getNode("/" + handle);
String locale1 = this.locale.getLanguage() + "_" + this.locale.getCountry();
String locale2 = this.locale.getLanguage();
if (c == null || (!c.hasProperty(locale1) && !c.hasProperty(locale2)))
@@ -146,38 +146,40 @@
keys = new ArrayList<String>();
Criteria criteria = JCRCriteriaFactory
- .createCriteria()
- .setWorkspace(MessagesConfigurationManager.MESSAGES_REPO)
- .setBasePath("//*")
- .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
- .addOrder(Order.desc("@jcr:score"));
+ .createCriteria()
+ .setWorkspace(MessagesConfigurationManager.MESSAGES_REPO)
+ .setBasePath("//*")
+ .add(Restrictions.eq("jcr:primaryType", "mgnl:contentNode"))
+ .addOrder(Order.desc("@jcr:score"));
AdvancedResult result = criteria.execute();
log.debug(
- "Number of messages loaded: {} with query {}",
- result.getTotalSize(),
- criteria.toXpathExpression());
+ "Number of messages loaded: {} with query {}",
+ result.getTotalSize(),
+ criteria.toXpathExpression());
for (AdvancedResultItem c : result.getItems())
{
-
PropertyIterator properties;
try
{
properties = c.getProperties();
- while (properties.hasNext())
+ String key = null;
+ while (properties.hasNext() && key == null)
{
Property nextProperty = properties.nextProperty();
try
{
- String key = StringUtils
- .substring(StringUtils.replace(nextProperty.getPath(), "/", "."), 1);
- if (StringUtils.isNotEmpty(key))
- {
- keys.add(key);
+ if (!nextProperty.getName().startsWith("jcr:") && !nextProperty.getName().startsWith("mgnl:")) {
+ key = StringUtils
+ .substring(StringUtils.replace(c.getPath(), "/", "."), 1);
+ if (StringUtils.isNotEmpty(key))
+ {
+ keys.add(key);
+ }
}
}
catch (RepositoryException e)
Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-03-05 14:31:16 UTC (rev 4610)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 14:40:17 UTC (rev 4611)
@@ -8,11 +8,11 @@
<jsp:directive.attribute name="jquery" required="false" rtexprvalue="true" type="java.lang.Boolean" />
<c:if test="${mgnl.editMode and cmsfn:canEdit()}">
<c:if test="${not empty jquery and jquery}">
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"><!-- -->
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"><!-- -->
</script>
</c:if>
<c:if test="${not empty jqueryui and jqueryui}">
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"><!-- -->
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/jquery-ui.min.js"><!-- -->
</script>
</c:if>
<script type="text/javascript">
@@ -65,6 +65,7 @@
height: 220,
width: 350,
modal: true,
+ dialogClass: 'msgEditDialogContainer',
buttons: {
"Save": function() {
var valueTxt = $("#dialog-msgEdit-value").val();
@@ -108,7 +109,7 @@
})($);
$('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/messages.css" />');
- $('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/jquery-ui-1.8.5.custom.css" />');
+ $('head').append('<link type="text/css" rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/themes/smoothness/jquery-ui.css" />');
$(document).ready(function(){
$(".msgEdit").mgnlMessageEdit();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
