ENH: refs #301 Fixed Select item page

Charles Ma · Charles Ma · commit 15965b8d0d6d · 2011-10-28T18:24:20.000+02:00
diff --git a/core/controllers/SearchController.php b/core/controllers/SearchController.php
@@ -208,7 +208,7 @@ public function liveAction()
 
       echo ', "value":"'.$itemDao->getName().'"';
 
-      if(isset($itemDao->count) && $itemDao->count == 1)
+      if(!isset($itemDao->count) || $itemDao->count == 1)
         {
         echo ', "itemid":"'.$itemDao->getItemId().'"';
         }
diff --git a/modules/remoteprocessing/controllers/components/ExecutableComponent.php b/modules/remoteprocessing/controllers/components/ExecutableComponent.php
@@ -225,6 +225,10 @@ private function _createParametersMatrix($cmdOptions)
         {
         $totalLine = $totalLine * count($cmdOption['values']);
         }
+      if($cmdOption['type'] == 'input')
+        {
+        $totalLine = $totalLine * count($cmdOption['item']);
+        }
       }
 
     $matrix = array();

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public function liveAction()`
`208`	`208`
`209`	`209`	`echo ', "value":"'.$itemDao->getName().'"';`
`210`	`210`
`211`		`- if(isset($itemDao->count) && $itemDao->count == 1)`
	`211`	`+ if(!isset($itemDao->count) \|\| $itemDao->count == 1)`
`212`	`212`	`{`
`213`	`213`	`echo ', "itemid":"'.$itemDao->getItemId().'"';`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,10 @@ private function _createParametersMatrix($cmdOptions)`
`225`	`225`	`{`
`226`	`226`	`$totalLine = $totalLine * count($cmdOption['values']);`
`227`	`227`	`}`
	`228`	`+ if($cmdOption['type'] == 'input')`
	`229`	`+ {`
	`230`	`+ $totalLine = $totalLine * count($cmdOption['item']);`
	`231`	`+ }`
`228`	`232`	`}`
`229`	`233`
`230`	`234`	`$matrix = array();`