[pLog-svn] r3355 - in plog/trunk: class/action/admin class/dao class/view/admin templates/admin

mark at devel.lifetype.net mark at devel.lifetype.net
Sun May 7 10:35:08 GMT 2006


Author: mark
Date: 2006-05-07 10:35:07 +0000 (Sun, 07 May 2006)
New Revision: 3355

Modified:
   plog/trunk/class/action/admin/adminaddpostaction.class.php
   plog/trunk/class/action/admin/adminnewpostaction.class.php
   plog/trunk/class/action/admin/adminpostmanagementcommonaction.class.php
   plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
   plog/trunk/class/action/admin/adminupdatepostaction.class.php
   plog/trunk/class/dao/blogsettings.class.php
   plog/trunk/class/view/admin/adminblogsettingsview.class.php
   plog/trunk/class/view/admin/admineditpostview.class.php
   plog/trunk/templates/admin/blogsettings.template
   plog/trunk/templates/admin/editpost.template
   plog/trunk/templates/admin/newpost.template
Log:
According to the discussion with Oscar in mailing list, I just revert the SVN rev 3352 change.

Because the "in_summary_page" in article DAO, only used in removing "configuration" post from summary page and no more other usages.

Modified: plog/trunk/class/action/admin/adminaddpostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddpostaction.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/action/admin/adminaddpostaction.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -44,8 +44,7 @@
         	$this->registerField( "commentsEnabled" );
         	$this->registerField( "customField" );
         	$this->registerField( "postDateTime" );
-        	$this->registerField( "trackbackUrls" );
-        	$this->registerField( "inSummary" );
+        	$this->registerField( "trackbackUrls" );        	
         }
 
 		/**
@@ -117,7 +116,6 @@
 			$article->setDateObject( $this->_postTimestamp );
 			$article->setCommentsEnabled( $this->_commentsEnabled );
 			$article->setGlobalCategoryId( $this->_globalArticleCategoryId );
-			$article->setInSummary( $this->_inSummary );
 		
 			// save the article to the db
 			$artId = $this->_savePostData( $article );

Modified: plog/trunk/class/action/admin/adminnewpostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewpostaction.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/action/admin/adminnewpostaction.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -42,7 +42,6 @@
         	// initialize the view
         	$this->_view = new AdminNewPostView( $this->_blogInfo );
             $this->_view->setValue( "sendNotification", $blogSettings->getValue( "default_send_notification" ));
-            $this->_view->setValue( "inSummary", $blogSettings->getValue( "default_article_in_summary" ));
             $this->setCommonData();
 
             // better to return true if everything fine

Modified: plog/trunk/class/action/admin/adminpostmanagementcommonaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminpostmanagementcommonaction.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/action/admin/adminpostmanagementcommonaction.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -25,7 +25,6 @@
         var $_postCategories;
         var $_postStatus;
         var $_sendNotification;
-        var $_inSummary;
 		var $_sendPings;
         var $_previewPost;
         var $_addPost;
@@ -130,7 +129,6 @@
 			$this->_postSlug = Textfilter::filterAllHTML($this->_request->getValue( "postSlug" ));
             $this->_postStatus   = $this->_request->getValue( "postStatus" );
             $this->_sendNotification = $this->_request->getValue( "sendNotification" );
-            $this->_inSummary = $this->_request->getValue( "inSummary" );
             $this->_sendTrackbacks = $this->_request->getValue( "sendTrackbacks" );
 			$this->_sendPings = $this->_request->getValue( "sendPings" );			
             $this->_postId       = $this->_request->getValue( "postId" );

Modified: plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -45,7 +45,6 @@
 			$this->registerField( "blogEnableAutosaveDrafts" );
 			$this->registerField( "blogShowInSummary" );
 			$this->registerField( "blogSendNotification" );
-			$this->registerField( "blogDefaultArticleInSummary" );
 			// set the view that we're going to use
 			$view = new AdminBlogSettingsView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
@@ -75,7 +74,6 @@
            	$blogSettings->setValue( "new_drafts_autosave_enabled", Textfilter::checkboxToBoolean($this->_request->getValue( "blogEnableAutosaveDrafts" )));
             $blogSettings->setValue( "comments_order", $this->_request->getValue( "blogCommentsOrder" ));
             $blogSettings->setValue( "default_send_notification", $this->_request->getValue( "blogSendNotification" ));
-            $blogSettings->setValue( "default_article_in_summary", $this->_request->getValue( "blogDefaultArticleInSummary" ));
             $this->_blogInfo->setAbout( Textfilter::filterAllHTML($this->_request->getValue( "blogAbout" )));
             $this->_blogInfo->setBlog( Textfilter::filterAllHTML($this->_request->getValue( "blogName" )));
             $this->_blogInfo->setSettings( $blogSettings );

Modified: plog/trunk/class/action/admin/adminupdatepostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatepostaction.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/action/admin/adminupdatepostaction.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -39,6 +39,7 @@
         	$this->registerFieldValidator( "postCategories", new ArrayValidator());
         	$this->registerFieldValidator( "postId", new IntegerValidator());
         	$this->registerFieldValidator( "globalArticleCategoryId", new IntegerValidator(), true );
+
         	$view = new AdminEditPostView( $this->_blogInfo );
 
             $dateTimeParts = explode(" ", $this->_request->getValue("postDateTime"));
@@ -64,8 +65,7 @@
         	$this->registerField( "commentsEnabled" );
         	$this->registerField( "customField" );
         	$this->registerField( "postDateTime" );   
-        	$this->registerField( "trackbackUrls" );
-        	$this->registerField( "inSummary" );
+        	$this->registerField( "trackbackUrls" );     	
         }
 
         /**
@@ -101,7 +101,6 @@
             $post->setCommentsEnabled( $this->_commentsEnabled );
 			$post->setPostSlug( $this->_postSlug );
 			$post->setGlobalCategoryId( $this->_globalArticleCategoryId );
-			$post->setInSummary( $this->_inSummary );
 
             // prepare the custom fields
             $fields = Array();

Modified: plog/trunk/class/dao/blogsettings.class.php
===================================================================
--- plog/trunk/class/dao/blogsettings.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/dao/blogsettings.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -56,7 +56,6 @@
             $this->setValue( "htmlarea_enabled", $config->getValue( "htmlarea_enabled" ));
 			$this->setValue( "pull_down_menu_enabled", $config->getValue("pull_down_menu_enabled"));
             $this->setValue( "comments_enabled", $config->getValue( "comments_enabled" ));
-            $this->setValue( "default_article_in_summary", true);
 			$this->setValue( "categories_order", 0 );
 			$this->setValue( "comments_order", $config->getValue( "comments_order" ));
 			$this->setValue( "time_offset", $config->getValue( "default_time_offset", DEFAULT_TIME_OFFSET ));

Modified: plog/trunk/class/view/admin/adminblogsettingsview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminblogsettingsview.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/view/admin/adminblogsettingsview.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -38,7 +38,6 @@
 			$this->setValue( "blogCategory", $this->_blogInfo->getBlogCategoryId());
 			$this->setValue( "blogShowInSummary", $this->_blogInfo->getShowInSummary());
 			$this->setValue( "blogSendNotification", $blogSettings->getValue( "default_send_notification" ));
-			$this->setValue( "blogDefaultArticleInSummary", $blogSettings->getValue( "default_article_in_summary" ));
 		}
 		
 		function render()

Modified: plog/trunk/class/view/admin/admineditpostview.class.php
===================================================================
--- plog/trunk/class/view/admin/admineditpostview.class.php	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/class/view/admin/admineditpostview.class.php	2006-05-07 10:35:07 UTC (rev 3355)
@@ -54,11 +54,6 @@
 	            $this->setValue( "postExtendedText", preg_replace('/&/','&',$this->_article->getExtendedText()));
 	            $this->setValue( "postSlug", $this->_article->getPostSlug());
 	            $this->setValue( "postId", $this->_article->getId());
-	            if( $this->_article->getInSummary())
-					$inSummary = true;
-	            else
-	            	$inSummary = false;
-	            $this->setValue( "inSummary", $inSummary );	
 	            if( $this->_article->getCommentsEnabled())
 					$commentsEnabled = true;
 	            else

Modified: plog/trunk/templates/admin/blogsettings.template
===================================================================
--- plog/trunk/templates/admin/blogsettings.template	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/templates/admin/blogsettings.template	2006-05-07 10:35:07 UTC (rev 3355)
@@ -134,14 +134,6 @@
     </div>
     
      <div class="field">
-      <label for="blogDefaultArticleInSummary">{$locale->tr("default_article_in_summary")}</label>
-      <div class="formHelp">
-        <input class="checkbox" type="checkbox" name="blogDefaultArticleInSummary" id="blogDefaultArticleInSummary" value="1" {if $blogDefaultArticleInSummary == true} checked="checked" {/if} />
-	    {$locale->tr("default_article_in_summary_help")}
-	  </div>
-    </div>
-    
-     <div class="field">
       <label for="blogSendNotification">{$locale->tr("default_send_notification")}</label>
       <div class="formHelp">
         <input class="checkbox" type="checkbox" name="blogSendNotification" id="blogSendNotification" value="1" {if $blogSendNotification == true} checked="checked" {/if} />

Modified: plog/trunk/templates/admin/editpost.template
===================================================================
--- plog/trunk/templates/admin/editpost.template	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/templates/admin/editpost.template	2006-05-07 10:35:07 UTC (rev 3355)
@@ -128,11 +128,6 @@
        </div>   
 	      
        <div class="field_checkbox">
-         <input class="checkbox" type="checkbox" id="inSummary" name="inSummary" value="1" {if $inSummary} checked="checked" {/if}/>
-		 <label for="inSummary">{$locale->tr("in_summary_help")}</label>
-	   </div>
-	   
-       <div class="field_checkbox">
          <input class="checkbox" type="checkbox" id="commentsEnabled" name="commentsEnabled" value="1" {if $postCommentsEnabled} checked="checked" {/if}/>
 		 <label for="commentsEnabled">{$locale->tr("post_comments_enabled_help")}</label>
 	   </div>

Modified: plog/trunk/templates/admin/newpost.template
===================================================================
--- plog/trunk/templates/admin/newpost.template	2006-05-06 20:33:52 UTC (rev 3354)
+++ plog/trunk/templates/admin/newpost.template	2006-05-07 10:35:07 UTC (rev 3355)
@@ -149,11 +149,6 @@
        </div>	   
    
        <div class="field_checkbox">
-         <input class="checkbox" type="checkbox" id="inSummary" name="inSummary" value="1" {if $inSummary} checked="checked" {/if}/>
-		 <label for="inSummary">{$locale->tr("in_summary_help")}</label>
-	   </div>
-
-       <div class="field_checkbox">
          <input class="checkbox" type="checkbox" id="commentsEnabled" name="commentsEnabled" value="1" {if $commentsEnabled} checked="checked" {/if}/>
 		 <label for="commentsEnabled">{$locale->tr("post_comments_enabled_help")}</label>
 	   </div>



More information about the pLog-svn mailing list