[pLog-svn] r5921 - plog/trunk/class/action/admin

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-09-08 03:56:55 -0400 (Sat, 08 Sep 2007)
New Revision: 5921

Modified:
   plog/trunk/class/action/admin/admincopyblogtemplatesetaction.class.php
Log:
Fixed an issue when copying a blog template

Modified: plog/trunk/class/action/admin/admincopyblogtemplatesetaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admincopyblogtemplatesetaction.class.php	2007-09-08 07:37:43 UTC (rev 5920)
+++ plog/trunk/class/action/admin/admincopyblogtemplatesetaction.class.php	2007-09-08 07:56:55 UTC (rev 5921)
@@ -6,7 +6,7 @@
 	lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );		
 	lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );	
-	lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );	
+	lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
 	
 	class AdminCopyBlogTemplateSetAction extends AdminBaseTemplateEditorAction
@@ -27,9 +27,9 @@
 		{
 			$this->AdminBaseTemplateEditorAction( $actionInfo, $request );
 			
-			$this->registerFieldValidator( "templateId", new TemplateNameValidator(), false);
-			$this->registerFieldValidator( "destTemplate", new StringValidator(), true );
-			$view = new AdminSiteTemplatesListView( $this->_blogInfo );
+			$this->registerFieldValidator( "templateId", new TemplateNameValidator());
+			$this->registerFieldValidator( "destTemplate", new StringValidator());
+			$view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr( "error_copying_template_set" ));
 			$this->setValidationErrorView( $view );
 			
@@ -40,12 +40,14 @@
 		
 		function validate()
 		{
-			if( !$this->validateTemplateName())
+			if( !parent::validate( Array( "templateId" ))) {
+				$this->validationErrorProcessing();				
 				return( false );
+			}
 
 			// check that the destination template does not exist
 			$this->_destTemplate = $this->_request->getFilteredValue( "destTemplate", TemplateTools::getTemplateNameFilter());
-			if( TemplateSets::isTemplate( $this->_destTemplate )) {
+			if( TemplateSets::isBlogTemplate( $this->_destTemplate, $this->_blogInfo->getId())) {
 				// show a more specific error message
 				$this->_validationErrorView->setErrorMessage( $this->_locale->tr( "error_template_set_already_exists" ));
 				$this->_form->setFieldValidationStatus( "destTemplate", false );