LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix für Publizierenprozess: ContentBundle wird jetzt ebenfalls republiziert. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1536 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-03-07 14:05:24 +00:00
parent 79cf36996a
commit 291e6bbe68
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-cms/src/com/arsdigita/cms/ContentItem.java
View File

@ -184,6 +184,7 @@ import java.util.Set;
* @author Jack Chung * @author Jack Chung
* @author Michael Pih * @author Michael Pih
* @author Stanislav Freidin <sfreidin@redhat.com> * @author Stanislav Freidin <sfreidin@redhat.com>
* @author Jens Pelzetter
* *
* @version $Id: ContentItem.java 2218 2011-06-22 23:55:36Z pboy $ * @version $Id: ContentItem.java 2218 2011-06-22 23:55:36Z pboy $
*/ */
@ -440,7 +441,8 @@ public class ContentItem extends VersionedACSObject implements CustomCopy {
} }
} }
/* * /*
* *
* removed cg - object observer sets context based on parent whenever parent * removed cg - object observer sets context based on parent whenever parent
* is updated * is updated
* *
@ -616,7 +618,9 @@ public class ContentItem extends VersionedACSObject implements CustomCopy {
* The item's root is the ancestor reachable through repeated * The item's root is the ancestor reachable through repeated
* <code>getParent()</code> calls whose parent is * <code>getParent()</code> calls whose parent is
* <code>null</code>. This is usually a folder, but may be any * <code>null</code>. This is usually a folder, but may be any
* {@see com.arsdigita.kernel.ACSObject}. * {
*
* @see com.arsdigita.kernel.ACSObject}.
* *
* Note that the name of the root folder of the content section where the * Note that the name of the root folder of the content section where the
* item resides is not included in the path. * item resides is not included in the path.
@ -1881,9 +1885,13 @@ public class ContentItem extends VersionedACSObject implements CustomCopy {
ContentBundle bundle = (ContentBundle) parent; ContentBundle bundle = (ContentBundle) parent;
ContentBundle liveBundle = (ContentBundle) bundle. ContentBundle liveBundle = (ContentBundle) bundle.
getPublicVersion(); getPublicVersion();
//jensp 2012-03-07 Changes to the ContentBundle were not
//published because the ContentBundle was not republished.
//Moved the next lines out of the if below to enable
//republishing of the ContentBundle
liveBundle =
(ContentBundle) bundle.createPendingVersion(null);
if (liveBundle == null) { if (liveBundle == null) {
liveBundle =
(ContentBundle) bundle.createPendingVersion(null);
} else { } else {
Set liveCatSet = new HashSet(); Set liveCatSet = new HashSet();
Set draftCatSet = new HashSet(); Set draftCatSet = new HashSet();
@ -2197,8 +2205,8 @@ public class ContentItem extends VersionedACSObject implements CustomCopy {
* {@link #getExtraXMLGenerators()}. But beware: The page state passed to * {@link #getExtraXMLGenerators()}. But beware: The page state passed to
* generators returned by this method will may be null. </p> * generators returned by this method will may be null. </p>
* *
* @return A list of all extra XML Generators for lists views of * @return A list of all extra XML Generators for lists views of this
* this content item. * content item.
*/ */
public List<ExtraXMLGenerator> getExtraListXMLGenerators() { public List<ExtraXMLGenerator> getExtraListXMLGenerators() {
return new ArrayList<ExtraXMLGenerator>(); return new ArrayList<ExtraXMLGenerator>();

1
ccm-cms/src/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
View File

@ -44,6 +44,7 @@ import com.arsdigita.bebop.form.Submit;
import com.arsdigita.cms.CMS; import com.arsdigita.cms.CMS;
import com.arsdigita.cms.CMSConfig; import com.arsdigita.cms.CMSConfig;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.SecurityManager;
import com.arsdigita.cms.Workspace; import com.arsdigita.cms.Workspace;