[jira] [Updated] (ROL-2046) Sorry! We couldn't find your document
[ https://issues.apache.org/jira/browse/ROL-2046?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] dongxu updated ROL-2046: Description: After we navigate to the design tab of setting when logging in, we can choose the 'basic mobile' for theme.Then we preview the mobile theme and click the 'View Mobile Weblog', this complain would take place, with complaining that Sorry! We couldn't find your document. [USER SOLUTION]: If you want to go back to normal, you have to remove the cookie key roller_user_request_type under roller domain in your browser. However, we have to say it is a bug. was: After we navigate to the design tab of setting when logging in, we can choose the 'basic mobile' for theme.Then we preview the mobile theme and click the 'View Mobile Weblog', this complain would take place, with complaining that Sorry! We couldn't find your document. [USER SOLUTION], you have to remove the cookie key roller_user_request_type under roller domain in your browser. However, we have to say it is a bug. Sorry! We couldn't find your document - Key: ROL-2046 URL: https://issues.apache.org/jira/browse/ROL-2046 Project: Apache Roller Issue Type: Bug Components: Themes and Macros, User Interface - General Environment: Tomcat 7.0.55 installed on Ubuntu 12.04 with MySQL 5.1 Reporter: dongxu Assignee: Roller Unassigned After we navigate to the design tab of setting when logging in, we can choose the 'basic mobile' for theme.Then we preview the mobile theme and click the 'View Mobile Weblog', this complain would take place, with complaining that Sorry! We couldn't find your document. [USER SOLUTION]: If you want to go back to normal, you have to remove the cookie key roller_user_request_type under roller domain in your browser. However, we have to say it is a bug. -- This message was sent by Atlassian JIRA (v6.2#6252)
svn commit: r1615402 - /roller/trunk/app/src/main/resources/ApplicationResources.properties
Author: gmazza Date: Sun Aug 3 12:12:58 2014 New Revision: 1615402 URL: http://svn.apache.org/r1615402 Log: ROL-2046 better clarify the scope of the theme preview option. Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1615402r1=1615401r2=1615402view=diff == --- roller/trunk/app/src/main/resources/ApplicationResources.properties (original) +++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sun Aug 3 12:12:58 2014 @@ -1289,8 +1289,8 @@ want to start over you can do so by copy themeEditor.preview=Preview Theme themeEditor.save=Update Theme -themeEditor.previewDescription=Use the preview option below to see how your blog \ -will look with the new theme prior to switching to it. +themeEditor.previewDescription=Prior to changing your theme, the preview option below \ +can be used to see how your blog''s main front page would look with the new theme. themeEditor.import=I want to copy the templates from an existing theme into my weblog. themeEditor.importWarning=WARNING: this operation may overwrite some of your \
svn commit: r1615415 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/core/plugins/ webapp/WEB-INF/jsps/admin/ webapp/WEB-INF/jsps/editor/ webapp/roller-ui/authoring/editors/
Author: gmazza Date: Sun Aug 3 15:56:47 2014 New Revision: 1615415 URL: http://svn.apache.org/r1615415 Log: Merged editor-xinha.jsp into editor-text.jsp; updated s:url, switching from deprecated id attribute to var. Removed: roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-xinha.jsp Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetGroups.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Bookmarks.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/BookmarksSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoriesSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntrySidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccessInclude.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageDimension.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Pings.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/ThemeEdit.jsp roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java?rev=1615415r1=1615414r2=1615415view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java Sun Aug 3 15:56:47 2014 @@ -37,7 +37,8 @@ public class XinhaEditor implements Webl } public String getJspPage() { -return /roller-ui/authoring/editors/editor-xinha.jsp; +// now handled within editor-text.jsp +return /roller-ui/authoring/editors/editor-text.jsp; } } Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp?rev=1615415r1=1615414r2=1615415view=diff == --- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp (original) +++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/CommonPingTargets.jsp Sun Aug 3 15:56:47 2014 @@ -61,13 +61,13 @@ !-- TODO: Use icons here -- td class=rollertable align=center s:if test=#pingTarget.autoEnabled -s:url id=disablePing action=commonPingTargets!disable +s:url var=disablePing action=commonPingTargets!disable s:param name=pingTargetId value=#pingTarget.id / /s:url s:a href=%{disablePing}s:text name=pingTarget.disable//s:a /s:if s:else -s:url id=enablePing action=commonPingTargets!enable +s:url var=enablePing action=commonPingTargets!enable s:param name=pingTargetId value=#pingTarget.id / /s:url s:a href=%{enablePing}s:text name=pingTarget.enable//s:a @@ -75,7 +75,7 @@ /td td class=rollertable align=center -s:url id=editPing action=commonPingTargetEdit +s:url var=editPing action=commonPingTargetEdit s:param name=bean.id value=#pingTarget.id / /s:url s:a href=%{editPing} @@ -84,7 +84,7 @@ /td td class=rollertable align=center -s:url id=removePing action=commonPingTargets!deleteConfirm +s:url var=removePing action=commonPingTargets!deleteConfirm s:param name=pingTargetId value=#pingTarget.id / /s:url s:a href=%{removePing} @@ -98,7 +98,7 @@ /table div style=padding: 4px; font-weight: bold; -s:url id=addPing action=commonPingTargetAdd +s:url var=addPing action=commonPingTargetAdd s:param name=weblog value=actionWeblog.handle / /s:url img src='s:url value=/images/add.png/' border=0alt=icon /s:a
svn commit: r1615416 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java resources/org/apache/roller/weblogger/config/roller.properties
Author: gmazza Date: Sun Aug 3 16:04:30 2014 New Revision: 1615416 URL: http://svn.apache.org/r1615416 Log: obsolete AcronymsPlugin removed. Removed: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/plugins/entry/AcronymsPlugin.java Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1615416r1=1615415r2=1615416view=diff == --- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original) +++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Sun Aug 3 16:04:30 2014 @@ -540,8 +540,8 @@ guice.backend.module=org.apache.roller.w plugins.page=\ org.apache.roller.weblogger.business.plugins.entry.ConvertLineBreaksPlugin \ ,org.apache.roller.weblogger.business.plugins.entry.ObfuscateEmailPlugin \ -,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin -#,org.apache.roller.weblogger.business.plugins.entry.AcronymsPlugin +,org.apache.roller.weblogger.business.plugins.entry.SmileysPlugin + # The list of configured WeblogEntryEditors available to users plugins.weblogEntryEditors=\
[jira] [Assigned] (ROL-1739) Missing constraint on weblogentrytagagg table
[ https://issues.apache.org/jira/browse/ROL-1739?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza reassigned ROL-1739: --- Assignee: Glen Mazza (was: Roller Unassigned) Missing constraint on weblogentrytagagg table - Key: ROL-1739 URL: https://issues.apache.org/jira/browse/ROL-1739 Project: Apache Roller Issue Type: Bug Components: Data Model JPA Backend Reporter: David Johnson Assignee: Glen Mazza from Tatsuya Noyori on the Roller user list: I have had an error on Roller that is caused by duplicated records on roller_weblogentrytagagg when I post an entry by AtomPub. Thus, I would like to suggest to add the following SQL to dbscript of create.sql in Roller. alter table roller_weblogentrytagagg add constraint rweta_name_uq unique ( websiteid, name ); -- This message was sent by Atlassian JIRA (v6.2#6252)
svn commit: r1615466 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.o
Author: gmazza Date: Sun Aug 3 23:48:16 2014 New Revision: 1615466 URL: http://svn.apache.org/r1615466 Log: ROL-1739 add a unique constraint on (website, tagname) to trap a potential error in the code. Only done for new databases created by createdb.vm; not for old databases upgrading via the migration script. Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml roller/trunk/app/src/main/resources/sql/createdb.vm Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1615466r1=1615465r2=1615466view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Sun Aug 3 23:48:16 2014 @@ -1161,7 +1161,7 @@ public class JPAWeblogEntryManagerImpl i siteTagData.setLastUsed(lastUsed); strategy.store(siteTagData); -} else if(siteTagData != null) { +} else if (siteTagData != null) { siteTagData.setTotal(siteTagData.getTotal() + amount); siteTagData.setLastUsed(lastUsed); strategy.store(siteTagData); Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml?rev=1615466r1=1615465r2=1615466view=diff == --- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml (original) +++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntryTagAggregate.orm.xml Sun Aug 3 23:48:16 2014 @@ -10,61 +10,11 @@ named-query name=WeblogEntryTagAggregate.getByNameamp;WebsiteOrderByLastUsedDesc querySELECT w FROM WeblogEntryTagAggregate w WHERE w.name = ?1 AND w.weblog = ?2 ORDER BY w.lastUsed DESC/query /named-query -named-query name=WeblogEntryTagAggregate.getByNameamp;WebsiteNullOrderByLastUsedDesc -querySELECT w FROM WeblogEntryTagAggregate w WHERE w.name = ?1 AND w.weblog IS NULL ORDER BY w.lastUsed DESC/query -/named-query -named-query name=WeblogEntryTagAggregate.getNameByNameInamp;Website -!-- querySELECT DISTINCT w.name FROM WeblogEntryTagAggregate w WHERE w.name IN (?1) AND w.weblog = ?2/query -- -querySELECT w.name FROM WeblogEntryTagAggregate w WHERE w.name IN (?1) AND w.weblog = ?2/query -/named-query -named-query name=WeblogEntryTagAggregate.getNameByNameInamp;WebsiteNull -!-- querySELECT DISTINCT w.name FROM WeblogEntryTagAggregate w WHERE w.name IN (?1) AND w.weblog IS NULL/query -- -querySELECT w.name FROM WeblogEntryTagAggregate w WHERE w.name IN (?1) AND w.weblog IS NULL/query -/named-query -named-query name=WeblogEntryTagAggregate.getPopularTagsByWebsiteamp;StartDate -querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog = ?1 AND w.lastUsed gt;= ?2 GROUP BY w.name, w.total ORDER BY w.total DESC/query -/named-query named-query name=WeblogEntryTagAggregate.getPopularTagsByWebsite querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog = ?1 GROUP BY w.name, w.total ORDER BY w.total DESC/query /named-query -named-query name=WeblogEntryTagAggregate.getPopularTagsByWebsiteNullamp;StartDate -querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog IS NULL AND w.lastUsed gt;= ?1 GROUP BY w.name, w.total ORDER BY w.total DESC/query -/named-query -named-query name=WeblogEntryTagAggregate.getPopularTagsByWebsiteNull -querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog IS NULL GROUP BY w.name, w.total ORDER BY w.total DESC/query -/named-query -named-query name=WeblogEntryTagAggregate.getTagsByWebsiteamp;NameStartsWith -querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog = ?1 AND w.name LIKE ?2 GROUP BY w.name, w.total /query -/named-query -named-query name=WeblogEntryTagAggregate.getTagsByWebsite -querySELECT w.name, SUM(w.total) FROM WeblogEntryTagAggregate w WHERE w.weblog = ?1 GROUP BY w.name, w.total/query -/named-query -
[jira] [Updated] (ROL-1982) Tree View for Archives
[ https://issues.apache.org/jira/browse/ROL-1982?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza updated ROL-1982: Assignee: Gaurav Saini (was: Roller Unassigned) Tree View for Archives -- Key: ROL-1982 URL: https://issues.apache.org/jira/browse/ROL-1982 Project: Apache Roller Issue Type: New Feature Components: Themes and Macros Reporter: Gaurav Saini Assignee: Gaurav Saini Priority: Minor Attachments: archiveTree.patch, archiveTree.png A macro that would provide the data of the Archives in Tree Structure something like [1]. I think it would be a nice enhancement to Roller, as Archive Pages are rarely used and this macro can be easily added to the Side menu of the blog. [1] http://coheigea.blogspot.com/ -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (ROL-1739) Missing constraint on weblogentrytagagg table
[ https://issues.apache.org/jira/browse/ROL-1739?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Glen Mazza resolved ROL-1739. - Resolution: Fixed Fix Version/s: 5.1 Added to createdb.vm script (for new databases) in order to trap the potential error in the code; not adding to the 500-to-510 migration script in case legacy invalid data exists in those tables. Missing constraint on weblogentrytagagg table - Key: ROL-1739 URL: https://issues.apache.org/jira/browse/ROL-1739 Project: Apache Roller Issue Type: Bug Components: Data Model JPA Backend Reporter: David Johnson Assignee: Glen Mazza Fix For: 5.1 from Tatsuya Noyori on the Roller user list: I have had an error on Roller that is caused by duplicated records on roller_weblogentrytagagg when I post an entry by AtomPub. Thus, I would like to suggest to add the following SQL to dbscript of create.sql in Roller. alter table roller_weblogentrytagagg add constraint rweta_name_uq unique ( websiteid, name ); -- This message was sent by Atlassian JIRA (v6.2#6252)
svn commit: r1615472 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/pojos/wrapper/ java/org/apache/roller/weblogger/ui/core/ java/org/apache/roller/weblogger/ui/core/security/ java/
Author: gmazza Date: Mon Aug 4 01:35:51 2014 New Revision: 1615472 URL: http://svn.apache.org/r1615472 Log: Removed users.sso.passwords.save option; renamed some properties from *.sso.* to *.ldap.* Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java?rev=1615472r1=1615471r2=1615472view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/UserWrapper.java Mon Aug 4 01:35:51 2014 @@ -51,7 +51,7 @@ public final class UserWrapper { * username to be displayed publicly, so screen name is returned instead. */ public String getUserName() { -if (WebloggerConfig.getBooleanProperty(user.privateUserNames)) { +if (WebloggerConfig.getBooleanProperty(user.hideUserNames)) { return this.pojo.getScreenName(); } return this.pojo.getUserName(); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java?rev=1615472r1=1615471r2=1615472view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerContext.java Mon Aug 4 01:35:51 2014 @@ -322,7 +322,7 @@ public class RollerContext extends Conte * @return AutoProvision */ public static AutoProvision getAutoProvision() { -String clazzName = WebloggerConfig.getProperty(users.sso.autoProvision.className); +String clazzName = WebloggerConfig.getProperty(users.ldap.autoProvision.className); if (null == clazzName) { return null; Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java?rev=1615472r1=1615471r2=1615472view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/RollerSession.java Mon Aug 4 01:35:51 2014 @@ -97,7 +97,7 @@ public class RollerSession // try one time to auto-provision, only happens if user==null // which means installation has SSO-enabled in security.xml -if (user == null WebloggerConfig.getBooleanProperty(users.sso.autoProvision.enabled)) { +if (user == null WebloggerConfig.getBooleanProperty(users.ldap.autoProvision.enabled)) { // provisioning enabled, get provisioner and execute AutoProvision provisioner = RollerContext.getAutoProvision(); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=1615472r1=1615471r2=1615472view=diff == --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Mon Aug 4 01:35:51 2014 @@ -50,12 +50,12 @@ public class CustomUserRegistry { private static final String DEFAULT_LOCALE_LDAP_ATTRIBUTE = locale; private static final String DEFAULT_TIMEZONE_LDAP_ATTRIBUTE = timezone; -private static final String SNAME_LDAP_PROPERTY = users.sso.registry.ldap.attributes.screenname; -private static final String UID_LDAP_PROPERTY = users.sso.registry.ldap.attributes.uid; -private