Changeset 4300

Show
Ignore:
Timestamp:
Mon Jan 9 07:56:14 2006
Author:
paul
Message:

Partial fix for #1623: Show pending publication status in Article Edit Status. I put the clock icon next to the drop down when there are future events. Also changed the publishing schedule to only show events which havent occurred yet.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/campsite/implementation/management/priv/articles/edit.php

    r4299 r4300  
    44 44 $issueObj =& new Issue($f_publication_id, $f_language_id, $f_issue_number);  
    45 45 $sectionObj =& new Section($f_publication_id, $f_issue_number, $f_language_id, $f_section_number);  
    46   $articleEvents = ArticlePublish::GetArticleEvents($f_article_number, $f_language_selected);  
      46 $articleEvents = ArticlePublish::GetArticleEvents($f_article_number, $f_language_selected, true);  
    46 46 $articleTopics = ArticleTopic::GetArticleTopics($f_article_number, $f_language_selected);  
    47 47 $articleFiles = ArticleAttachment::GetAttachmentsByArticleNumber($f_article_number, $f_language_selected);  
    273 273                                     break;  
    274 274                             }  
    275                           } ?>  
      275                         }  
      276                         if ( ($articleObj->getPublished() == 'S') && (count($articleEvents) > 0)) {  
      277                             ?>  
      278                             <img src="<?php echo $Campsite["ADMIN_IMAGE_BASE_URL"]; ?>/automatic_publishing.png" alt="<?php  putGS("Scheduled Publishing"); ?>" title="<?php  putGS("Scheduled Publishing"); ?>" border="0" width="22" height="22" align="middle" style="padding-bottom: 1px;">  
      279                             <?php  
      280                         }  
      281                         ?>  
      282                          
    276 283                     </TD>     
    277 284                     <!-- END Workflow -->  

  • trunk/campsite/implementation/management/classes/ArticlePublish.php

    r4270 r4300  
    252 252      * @param int $p_articleNumber  
    253 253      * @param int $p_languageId  
      254      * @param boolean $p_onlyFutureEvents  
    254 255      * @return array  
    255 256      */  
    256       function GetArticleEvents($p_articleNumber, $p_languageId = null)  
      257     function GetArticleEvents($p_articleNumber, $p_languageId = null, $p_onlyFutureEvents = false)  
    256 257     {  
    257 258         global $Campsite;  
    262 263             $queryStr .= " AND fk_language_id=$p_languageId ";  
    263 264         }  
      265         if ($p_onlyFutureEvents) {  
      266             $datetime = strftime("%Y-%m-%d %H:%M:00");  
      267             $queryStr .= " AND time_action >= '" . $datetime . "'"  
      268                         . " AND is_completed != 'Y'";  
      269         }  
      270  
    264 271         $queryStr .= ' ORDER BY time_action ASC ';  
    265 272         $result = DbObjectArray::Create('ArticlePublish', $queryStr);