You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2010/03/24 05:04:45 UTC
svn commit: r926928 - in /roller/trunk/weblogger-business/src/main:
java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
java/org/apache/roller/weblogger/pojos/MediaFile.java
resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
Author: snoopdave
Date: Wed Mar 24 04:04:44 2010
New Revision: 926928
URL: http://svn.apache.org/viewvc?rev=926928&view=rev
Log:
Fixing an unreported bug that prevented Shared Theme files from being copied into a blog as a Custom theme when the blog is missing action templates
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=926928&r1=926927&r2=926928&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Wed Mar 24 04:04:44 2010
@@ -198,10 +198,8 @@ public class ThemeManagerImpl implements
// if template is an action, lookup by action
if(themeTemplate.getAction() != null &&
!themeTemplate.getAction().equals(WeblogTemplate.ACTION_CUSTOM)) {
+ importedActionTemplates.add(themeTemplate.getAction());
template = wmgr.getPageByAction(website, themeTemplate.getAction());
- if(template != null) {
- importedActionTemplates.add(themeTemplate.getAction());
- }
// otherwise, lookup by name
} else {
Modified: roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java?rev=926928&r1=926927&r2=926928&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (original)
+++ roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java Wed Mar 24 04:04:44 2010
@@ -41,7 +41,7 @@ public class MediaFile {
private String name;
private String description;
private String copyrightText;
- private Boolean isSharedForGallery;
+ private Boolean isSharedForGallery = Boolean.FALSE;
private long length;
private int width = -1;
private int height = -1;
Modified: roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml?rev=926928&r1=926927&r2=926928&view=diff
==============================================================================
--- roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml (original)
+++ roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/pojos/MediaFile.orm.xml Wed Mar 24 04:04:44 2010
@@ -50,7 +50,7 @@
<column name="last_updated" insertable="true" updatable="true" unique="false"/>
</basic>
<basic name="sharedForGallery">
- <column name="is_public" insertable="true" updatable="true" unique="false"/>
+ <column name="is_public" insertable="true" updatable="true" unique="false" nullable="false" />
</basic>
<basic name="creatorUserName">
<column name="creator" insertable="true" updatable="true" unique="false" />