[webui] fix service parameter editor showing existing parameters.

openSUSE · Jan 26, 2012 · 5da2c51 · 5da2c51
1 parent 36e65f4
commit 5da2c51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/webui/app/controllers/package_controller.rb b/src/webui/app/controllers/package_controller.rb
@@ -219,14 +219,10 @@ def submit_request
   end
 
   def service_parameter
-    begin
-      @serviceid = params[:serviceid]
-      @servicename = params[:servicename]
-      @services = find_cached(Service,  :project => @project, :package => @package )
-      @parameters = @services.getParameters(@serviceid)
-    rescue
-      @parameters = []
-    end
+    @serviceid = params[:serviceid]
+    @servicename = params[:servicename]
+    @services = find_cached(Service,  :project => @project, :package => @package )
+    @parameters = @services.getParameters(@serviceid)
   end
 
   def update_parameters

diff --git a/src/webui/app/models/service.rb b/src/webui/app/models/service.rb
@@ -160,7 +160,7 @@ def addService( name, position=-1, parameters=[] )
   def getParameters(serviceid)
      ret = []
      each("/services/service[#{serviceid}]/param") do |p|
-       ret << { :name => p.value(:name), :value => p.find_first(:value).text }
+       ret << { :name => p.value(:name), :value => p.text }
      end
 
      return ret