Allow multiple publish_if* flags with Krang::ElementClass::CategoryLink.

git-svn-id: http://svn.krangcms.com/trunk/krang@6684 689d98c0-9023-0410-9c0b-f79783857903

Author: bobesch

element_lib/TestSet1/article.pm

@@ -132,6 +132,12 @@ sub new {
                  name => "media_below_cat",
                  publish_if_modified_media_below_cat => 1
              ),
+
+             pkg('ElementClass::CategoryLink')->new(
+                 name => "story_and_media_in_cat",
+                 publish_if_modified_story_in_cat => 1,
+                 publish_if_modified_media_in_cat => 1
+             ),
         ],
         @_
     );

lib/Krang/Publisher.pm

@@ -895,7 +895,7 @@ sub asset_list {
         initial_assets    => 1
     );
 
-    $self->_maybe_add_index_story(\@publish_list);
+    $self->_maybe_add_index_story(\@publish_list) if $mode eq 'publish';
 
     #     unless ($keep_list) {
     #         $self->_clear_asset_lists();
@@ -2532,14 +2532,15 @@ sub _get_conditional_index_stories {
                 # build story/media-specific tables mapping category id to index story
                 if ($element->class->publish_if_modified_story_in_cat) {
                     $all_index_stories{story}{$category->category_id} = $story;
-                } elsif ($element->class->publish_if_modified_story_below_cat) {
+                }
+                if ($element->class->publish_if_modified_story_below_cat) {
                     $self->_add_conditional_index_stories($story, $category, 'story', \%all_index_stories);
-                } elsif ($element->class->publish_if_modified_media_in_cat) {
+                }
+                if ($element->class->publish_if_modified_media_in_cat) {
                     $all_index_stories{media}{$category->category_id} = $story;
-                } elsif ($element->class->publish_if_modified_media_below_cat) {
+                }
+                if ($element->class->publish_if_modified_media_below_cat) {
                     $self->_add_conditional_index_stories($story, $category, 'media', \%all_index_stories);
-                } else {
-                    return;
                 }
             }
         } $story->element;

t/publish.t

@@ -2242,6 +2242,13 @@ sub test_publish_if_modified_in_category {
     $index->save;
     not_published_index($media_color, $index, "deleted catlink: don't publish index media");
     not_published_index($media_red, $index, "deleted catlink: don't publish index media");
+
+    # combined story/media catlink
+    my $catlink_story_in = $index->element->add_child(class => 'story_and_media_in_cat');
+    $index->element->child('story_and_media_in_cat')->data($cat_color);
+    $index->save;
+    published_index($story_color, $index, "set category 'color' in catlink: publish index story");
+    published_index($media_color, $index, "set category 'color' in catlink: publish index story");
 }