[pLog-svn] r6644 - plog/branches/lifetype-1.2/class/action/admin

[mark at devel.lifetype.net]

Author: mark
Date: 2008-06-22 12:46:07 -0400 (Sun, 22 Jun 2008)
New Revision: 6644

Modified:
   plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
Log:
Revert the change of rev. 6622. Not all description are option. 

I like to keep these functions work as before.

But, we always can change these in 2.0.



Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddarticlecategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -3,7 +3,7 @@
 	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
-    lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+    lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );	
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
@@ -18,7 +18,7 @@
 	{
 
     	var $_categoryName;
-		var $_categoryDescription;
+		var $_categoryDescription;
 		var $_categoryInMainPage;
 
     	/**
@@ -31,9 +31,9 @@
 			
 			// register two validators
 			$this->registerFieldValidator( "categoryName", new StringValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			$this->registerFieldValidator( "categoryInMainPage", new IntegerValidator(), true );
-
+
 			// and the view we should show in case there is a validation error
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "newpostcategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_adding_article_category" ));			

Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddblogcategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -27,7 +27,7 @@
 			
 			// register two validators
 			$this->registerFieldValidator( "categoryName", new StringValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			// and the view we should show in case there is a validation error
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "newblogcategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_adding_blog_category" ));			

Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddglobalarticlecategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -33,7 +33,7 @@
 			
 			// register two validators
 			$this->registerFieldValidator( "categoryName", new StringValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			// and the view we should show in case there is a validation error
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "newglobalarticlecategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_adding_global_article_category" ));			

Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdatearticlecategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -35,7 +35,7 @@
 			// data validation settings
 			$this->registerFieldValidator( "categoryName", new StringValidator());
 			$this->registerFieldValidator( "categoryId", new IntegerValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			$this->registerFieldValidator( "categoryInMainPage", new IntegerValidator(), true );
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "editarticlecategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));

Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdateblogcategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -34,7 +34,7 @@
 			// data validation settings
 			$this->registerFieldValidator( "categoryName", new StringValidator());
 			$this->registerFieldValidator( "categoryId", new IntegerValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "editblogcategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
 			$this->setValidationErrorView( $errorView );

Modified: plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php	2008-06-21 20:48:40 UTC (rev 6643)
+++ plog/branches/lifetype-1.2/class/action/admin/adminupdateglobalarticlecategoryaction.class.php	2008-06-22 16:46:07 UTC (rev 6644)
@@ -38,7 +38,7 @@
 			// data validation settings
 			$this->registerFieldValidator( "categoryName", new StringValidator());
 			$this->registerFieldValidator( "categoryId", new IntegerValidator());
-			$this->registerFieldValidator( "categoryDescription", new StringValidator(), true );
+			$this->registerFieldValidator( "categoryDescription", new StringValidator() );
 			$errorView = new AdminTemplatedView( $this->_blogInfo, "editglobalarticlecategory" );
 			$errorView->setErrorMessage( $this->_locale->tr("error_updating_article_category" ));
 			$this->setValidationErrorView( $errorView );