[Eis-commits] SF.net SVN: eis: [221] trunk

[<luu...@us...>]

Revision: 221
          http://eis.svn.sourceforge.net/eis/?rev=221&view=rev
Author:   luukvandenbroek
Date:     2007-11-08 13:31:14 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
fixed bug and made small change to makeOptions element

Modified Paths:
--------------
    trunk/cfg/applications.xml
    trunk/mod/eis_engine/elements/EditApplication.php
    trunk/mod/eis_widget/services/MainService.php

Modified: trunk/cfg/applications.xml
===================================================================
--- trunk/cfg/applications.xml	2007-11-08 20:18:14 UTC (rev 220)
+++ trunk/cfg/applications.xml	2007-11-08 21:31:14 UTC (rev 221)
@@ -18,4 +18,10 @@
 		<application>examples</application>
 		<environment>minimal</environment>
 	</application>
+	<application>
+		<name>dsaasd</name>
+		<module>eis_engine</module>
+		<application>servermanager</application>
+		<environment>minimal</environment>
+	</application>
 </applications>

Modified: trunk/mod/eis_engine/elements/EditApplication.php
===================================================================
--- trunk/mod/eis_engine/elements/EditApplication.php	2007-11-08 20:18:14 UTC (rev 220)
+++ trunk/mod/eis_engine/elements/EditApplication.php	2007-11-08 21:31:14 UTC (rev 221)
@@ -33,7 +33,11 @@
                         $inputs[] = $sWidget->inputString('application',$app['application'],$options);
 
                         $labels[] = 'eis_engine.l.environment';
-                        $options = $sWidget->makeOptions($sModule->listEnvironments(),'eis_engine.l.select');
+			$options = array();
+			$environments = $sConfig->getEnvironments();
+			foreach($environments as $environment){
+				$options[] = array('label' => $environment['name'], 'value' => $environment['name']);
+			}
                         $inputs[] = $sWidget->inputString('environment',$app['environment'],$options);
 
 			$labels[] = 'eis_engine.l.default';

Modified: trunk/mod/eis_widget/services/MainService.php
===================================================================
--- trunk/mod/eis_widget/services/MainService.php	2007-11-08 20:18:14 UTC (rev 220)
+++ trunk/mod/eis_widget/services/MainService.php	2007-11-08 21:31:14 UTC (rev 221)
@@ -859,8 +859,12 @@
 				$options[] = array('label' => $this->e->getString($title), 'value' => '');
 			}
 			if(is_array($values)) {
-				foreach($values as $value) {
-					$options[] = array('label' => $value, 'value' => $value);
+				foreach($values as $k => $value) {
+					if(is_array($value)){
+						$options[] = array('label' => $k, 'value' => $k);
+					}else{
+						$options[] = array('label' => $value, 'value' => $value);
+					}
 				}
 			}
 			return $options;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.