Changeset 4133

Show
Ignore:
Timestamp:
Tue Dec 6 22:23:06 2005
Author:
paul
Message:

Fixed bug #1568 - Article List: Scheduled publishing icon should only appear if there are events in the future. In the API, I replaced occurrences of with . Fixed a bug in ArticleAttachment?::OnArticleDelete() as a result of this.

Files:

Legend:

Unmodified
Added
Removed
Modified

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

    r4118 r4133  
    363 363             <?php  
    364 364             if ($articleObj->getPublished() != 'N') {  
    365                   $events = ArticlePublish::GetArticleEvents($articleObj->getArticleNumber(),  
      365                 $hasPendingActions =  
      366                     ArticlePublish::ArticleHasFutureActions($articleObj->getArticleNumber(),  
    366 367                     $articleObj->getLanguageId());  
    367                   if (count($events) > 0) { ?>  
      368                 if ($hasPendingActions) { ?>  
    367 368             <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">  
    368 369                 <?php  

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

    r4129 r4133  
    138 138         global $Campsite;  
    139 139         $queryStr = 'DELETE FROM ArticleAttachments'  
    140                       ." WHERE fk_article_number='".$p_articleId."'";  
      140                     ." WHERE fk_article_number='".$p_articleNumber."'";  
    140 140         $Campsite['db']->Execute($queryStr);         
    141 141     } // fn OnArticleDelete  

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

    r4102 r4133  
    34 34      *  
    35 35      * @param string $p_articleType  
    36        * @param int $p_articleId  
      36      * @param int $p_articleNumber  
    36 36      * @param int $p_languageId  
    37 37      */  
    38       function ArticleData($p_articleType, $p_articleId, $p_languageId)  
      38     function ArticleData($p_articleType, $p_articleNumber, $p_languageId)  
    38 38     {  
    39 39         $this->m_articleTypeName = $p_articleType;  
    47 47         }  
    48 48         parent::DatabaseObject($this->m_columnNames);  
    49           $this->m_data['NrArticle'] = $p_articleId;  
      49         $this->m_data['NrArticle'] = $p_articleNumber;  
    49 49         $this->m_data['IdLanguage'] = $p_languageId;  
    50 50         if ($this->exists()) {  

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

    r4104 r4133  
    46 46      * Link a topic to an article.  
    47 47      * @param int $p_topicId  
    48        * @param int $p_articleId  
      48      * @param int $p_articleNumber  
    48 48      * @return void  
    49 49      */  
    50       function AddTopicToArticle($p_topicId, $p_articleId)  
      50     function AddTopicToArticle($p_topicId, $p_articleNumber)  
    50 50     {  
    51 51         global $Campsite;  
    52 52         $logtext = getGS('Topic $1 added to article', $p_topicId);  
    53 53         $queryStr = 'INSERT IGNORE INTO ArticleTopics(NrArticle, TopicId)'  
    54                       .' VALUES('.$p_articleId.', '.$p_topicId.')';  
      54                     .' VALUES('.$p_articleNumber.', '.$p_topicId.')';  
    54 54         $Campsite['db']->Execute($queryStr);  
    55 55         Log::Message($logtext, null, 144);  
    …… 
    63 63      * Unlink a topic from an article.  
    64 64      * @param int $p_topicId  
    65        * @param int $p_articleId  
      65      * @param int $p_articleNumber  
    65 65      * @return void  
    66 66      */  
    67       function RemoveTopicFromArticle($p_topicId, $p_articleId)  
      67     function RemoveTopicFromArticle($p_topicId, $p_articleNumber)  
    67 67     {  
    68 68         global $Campsite;  
    69 69         $logtext = getGS('Article topic $1 deleted', $p_topicId);  
    70           $queryStr = "DELETE FROM ArticleTopics WHERE NrArticle=$p_articleId AND TopicId=$p_topicId";  
      70         $queryStr = "DELETE FROM ArticleTopics WHERE NrArticle=$p_articleNumber AND TopicId=$p_topicId";  
    70 70         $Campsite['db']->Execute($queryStr);  
    71 71         Log::Message($logtext, null, 145);       
    78 78     /**  
    79 79      * Remove topic pointers for the given article.  
    80        * @param int $p_articleId  
      80      * @param int $p_articleNumber  
    80 80      * @return void  
    81 81      */  
    82       function OnArticleDelete($p_articleId)  
      82     function OnArticleDelete($p_articleNumber)  
    82 82     {  
    83 83         global $Campsite;  
    84 84         $queryStr = 'DELETE FROM ArticleTopics'  
    85                       ." WHERE NrArticle='".$p_articleId."'";  
      85                     ." WHERE NrArticle='".$p_articleNumber."'";  
    85 85         $Campsite['db']->Execute($queryStr);         
    86 86     } // fn OnArticleDelete  

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

    r4122 r4133  
    1302 1302      *      The language ID.  
    1303 1303      *  
    1304        * @param int $p_articleId -  
    1305        *      The article ID.  
      1304      * @param int $p_articleNumber -  
      1305      *      The article number.  
    1306 1306      *  
    1307 1307      * @param int $p_preferredLanguage -  
    …… 
    1328 1328     function GetArticles($p_publicationId = null, $p_issueId = null,  
    1329 1329                          $p_sectionId = null, $p_languageId = null,  
    1330                            $p_articleId = null, $p_preferredLanguage = null,  
      1330                          $p_articleNumber = null, $p_preferredLanguage = null,  
    1330 1330                          $p_numRows = null, $p_startAt = '',  
    1331 1331                          $p_numRowsIsUniqueRows = false)  
    1347 1347             $whereClause[] = "IdLanguage=$p_languageId";  
    1348 1348         }  
    1349           if (!is_null($p_articleId)) {  
    1350               $whereClause[] = "Number=$p_articleId";  
      1349         if (!is_null($p_articleNumber)) {  
      1350             $whereClause[] = "Number=$p_articleNumber";  
    1351 1351         }  
    1352 1352  

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

    r4109 r4133  
    253 253      * Returns an array of ArticlePublish objects.  
    254 254      *  
    255        * @param int $p_articleId  
      255      * @param int $p_articleNumber  
    255 255      * @param int $p_languageId  
    256 256      * @return array  
    257 257      */  
    258       function GetArticleEvents($p_articleId, $p_languageId = null)  
      258     function GetArticleEvents($p_articleNumber, $p_languageId = null)  
    258 258     {  
    259 259         global $Campsite;  
    260 260         $queryStr = 'SELECT * FROM ArticlePublish '  
    261                       ." WHERE fk_article_number=$p_articleId";  
      261                     ." WHERE fk_article_number=$p_articleNumber";  
    261 261         if (!is_null($p_languageId)) {  
    262 262             $queryStr .= " AND fk_language_id=$p_languageId ";  
    …… 
    280 280         $datetime = strftime("%Y-%m-%d %H:%M:00");  
    281 281         $queryStr = "SELECT * FROM ArticlePublish, Articles "  
    282                       . " WHERE ArticlePublish.time_action <= '$datetime'"  
      282                     . " WHERE ArticlePublish.fk_article_number=Articles.Number"  
      283                     . " AND ArticlePublish.time_action <= '$datetime'"  
    283 284                     . " AND ArticlePublish.is_completed != 'Y'"  
    284 285                     . " AND Articles.Published != 'N'"  
    290 291      
    291 292     /**  
      293      * Return TRUE if there are actions scheduled in the future.  
      294      * @param int $p_articleNumber  
      295      * @param int $p_languageId  
      296      * @return boolean  
      297      */  
      298     function ArticleHasFutureActions($p_articleNumber, $p_languageId)  
      299     {  
      300         global $Campsite;  
      301         $datetime = strftime("%Y-%m-%d %H:%M:00");  
      302         $queryStr = "SELECT COUNT(*) FROM ArticlePublish, Articles "  
      303                     . " WHERE ArticlePublish.fk_article_number=$p_articleNumber"  
      304                     . " AND ArticlePublish.fk_language_id=$p_languageId"  
      305                     . " AND ArticlePublish.fk_article_number=Articles.Number"  
      306                     . " AND ArticlePublish.time_action > '$datetime'"  
      307                     . " AND ArticlePublish.is_completed != 'Y'"  
      308                     . " AND Articles.Published != 'N'"  
      309                     . " ORDER BY ArticlePublish.time_action ASC";  
      310         $result = $Campsite['db']->GetOne($queryStr);  
      311         return ($result > 0);  
      312     } // fn ArticleHasFutureActions  
      313      
      314      
      315     /**  
    292 316      * Execute all pending actions.  
    293 317      * @return void  

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

    r4085 r4133  
    50 50      * @param int $p_sectionId  
    51 51      * @param int $p_languageId  
    52        * @param int $p_articleId  
      52      * @param int $p_articleNumber  
    52 52      * @return void  
    53 53      */  
    54       function OnArticleDelete($p_publicationId, $p_issueId, $p_sectionId, $p_languageId, $p_articleId)  
      54     function OnArticleDelete($p_publicationId, $p_issueId, $p_sectionId, $p_languageId, $p_articleNumber)  
    54 54     {  
    55 55         global $Campsite;  
    60 60                     ." AND NrIssue=$p_issueId "  
    61 61                     ." AND NrSection=$p_sectionId "  
    62                       ." AND NrArticle=$p_articleId "  
      62                     ." AND NrArticle=$p_articleNumber "  
    62 62                     ." AND IdLanguage=$p_languageId";  
    63 63         $Campsite['db']->Execute($queryStr);         

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

    r4032 r4133  
    35 35      *  
    36 36      * @param string $p_articleType  
    37        * @param int $p_articleId  
    38        * @param int $p_languageId  
    39 37      */  
    40 38     function ArticleType($p_articleType)