http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72983
Revision: 72983
Author: jeroendedauw
Date: 2010-09-14 15:53:28 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Changes for 0.7 - updated form inputs to use Validator 0.4
Modified Paths:
--------------
trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php
trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_MapPrinter.php
Modified: trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php
===================================================================
--- trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php
2010-09-14 15:52:48 UTC (rev 72982)
+++ trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php
2010-09-14 15:53:28 UTC (rev 72983)
@@ -43,11 +43,6 @@
protected $markerCoords;
/**
- * @var string
- */
- protected $errorList;
-
- /**
* Parameters specific to this feature.
*
* @var mixed
@@ -117,12 +112,16 @@
$parameterInfo = array_merge_recursive( $parameterInfo,
$this->service->getParameterInfo() );
$parameterInfo = array_merge_recursive( $parameterInfo,
$this->getSpecificParameterInfo() );
- $manager = new ValidationManager();
-
- $showMap = $manager->manageParsedParameters( $mapProperties,
$parameterInfo );
+ $validator = new Validator( 'form' ); // TODO
+ $validator->setParameters( $mapProperties, $parameterInfo );
+
+ $validator->validateParameters();
+
+ $showMap = $validator->hasFatalError();
+
if ( $showMap ) {
- $parameters = $manager->getParameters( false );
+ $parameters = $validator->getParameterValues();
foreach ( $parameters as $paramName => $paramValue ) {
if ( !property_exists( __CLASS__, $paramName )
) {
@@ -135,8 +134,6 @@
}
}
- $this->errorList = $manager->getErrorList();
-
return $showMap;
}
@@ -156,7 +153,7 @@
$showInput = $this->setMapProperties( $field_args );
if ( !$showInput ) {
- return array( $this->errorList );
+ return array( '' );
}
$this->setCoordinates();
Modified: trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_MapPrinter.php
===================================================================
--- trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_MapPrinter.php
2010-09-14 15:52:48 UTC (rev 72982)
+++ trunk/extensions/SemanticMaps/Features/QueryPrinters/SM_MapPrinter.php
2010-09-14 15:53:28 UTC (rev 72983)
@@ -163,17 +163,17 @@
$parameterInfo = array_merge_recursive( $parameterInfo,
$this->service->getParameterInfo() );
$parameterInfo = array_merge_recursive( $parameterInfo,
$this->getSpecificParameterInfo() );
- $this->validator = new Validator( $this->getName() );
+ $validator = new Validator( $this->getName() );
- $this->validator->setParameters( $mapProperties, $parameterInfo
);
+ $validator->setParameters( $mapProperties, $parameterInfo );
- $this->validator->validateParameters();
+ $validator->validateParameters();
- $showMap = $this->validator->hasFatalError();
+ $showMap = $validator->hasFatalError();
if ( $showMap ) {
- $this->validator->formatParameters();
- $this->setMapProperties(
$this->validator->getParameterValues() );
+ $validator->formatParameters();
+ $this->setMapProperties(
$validator->getParameterValues() );
}
return $showMap;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
