summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarron.woods@gmail.com <arron.woods@gmail.com@deae1e92-32f9-c189-e222-5b9b5081a27a>2012-11-30 12:53:02 +0000
committerarron.woods@gmail.com <arron.woods@gmail.com@deae1e92-32f9-c189-e222-5b9b5081a27a>2012-11-30 12:53:02 +0000
commit28ba6f821695d4b462be79f5618a26ea20419cb0 (patch)
tree6a752a1af5ea898d88ae766ced13adc3828b14e4
parentd12bcd0a5e390052deeb86efdf8d99b781b78b98 (diff)
downloadphp-ssrs-28ba6f821695d4b462be79f5618a26ea20419cb0.zip
php-ssrs-28ba6f821695d4b462be79f5618a26ea20419cb0.tar.gz
php-ssrs-28ba6f821695d4b462be79f5618a26ea20419cb0.tar.bz2
isSelect method, only filter defaults on isSelect
-rwxr-xr-xlibrary/SSRS/Object/ReportParameter.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/library/SSRS/Object/ReportParameter.php b/library/SSRS/Object/ReportParameter.php
index f36fafa..77dbc3b 100755
--- a/library/SSRS/Object/ReportParameter.php
+++ b/library/SSRS/Object/ReportParameter.php
@@ -22,13 +22,16 @@ class SSRS_Object_ReportParameter extends SSRS_Object_Abstract {
$defaults = (array) $this->data['DefaultValues']->Value;
}
- $validValues = array();
- foreach ($this->getValidValues() AS $validValue) {
- $validValues[] = $validValue->Value;
+ if ($this->isSelect()) {
+ $validValues = array();
+ foreach ($this->getValidValues() AS $validValue) {
+ $validValues[] = $validValue->Value;
+ }
+
+ $defaults = array_intersect($defaults, $validValues);
}
- $validDefaults = array_intersect($defaults, $validValues);
- return $validDefaults;
+ return $defaults;
}
public function getValidValues() {
@@ -78,4 +81,8 @@ class SSRS_Object_ReportParameter extends SSRS_Object_Abstract {
return !empty($this->data['MultiValue']);
}
+ public function isSelect() {
+ return isset($this->data['ValidValues']);
+ }
+
}