August 2009 - YaST Development - openSUSE Mailing Lists

Re: [yast-devel] WebYaST Architecture Naming Conventions
by Martin Schmidkunz 18 Aug '09

18 Aug '09

> http://en.opensuse.org/YaST/Web/Architecture/Naming Cool! I took the liberty of adding two UI-related terms there as well: Home: Page with status information, quick links to modules and all modules. All Modules: Page which gives access to all available modules (equals control center in YaST) The idea was to gather terms at one site so we might one day get a nice glossary :-) If you don`t think it`s appropriate: well, it`s a wiki :-) Cu, Martin Martin Schmidkunz User Experience Team martin.schmidkunz(a)novell.com +49 (0) 911 740 53-346 Novell® Making IT Work As One™ ------------------------------------- SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg) -------------------------------------

1 0

[yast-devel] WebYaST Architecture Naming Conventions
by Klaus Kaempf 18 Aug '09

18 Aug '09

Hi, the recent mail threads showed some confusion about the different parts of the WebYaST architecture and how to name things. I have now started a 'WebYaST architecture naming' page at http://en.opensuse.org/YaST/Web/Architecture/Naming and tried to define an initial set of terms. I encourage all of you to add and adapt this page as you see fit. Just don't change anything in silence but spread the word on the mailing list. Thanks ! Klaus --- SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg) -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0

[yast-devel] WebYaST: Network CIM Model
by Martin Vidner 17 Aug '09

17 Aug '09

CIM naming ---------- As you can see, the nice names "configs", "devices", "routes", etc. are gone. Welcome to CIM! WORK-IN-PROGRESS: the REST aspect is not covered now, because the way CIM composes the data using subclassed associations makes it hard to figure out, and below are only guesses. A Confusingly Irritating Model :-) note to XML: - I use the usual ruby attributes like type=array/boolean. - Additionally I use <Foo value='80'>HTTP</> to combine CIM enumerations (Value+ValueMap) - CIM is CamelCase. We may want to adapt_it_to_ruby CIM_NetworkPort means "network interface", not a "(TCP/IP )protocol port" (hierarchy: EthernetPort: NetworkPort: LogicalPort: LogicalDevice: EnabledLogicalElement: LogicalElement: ManagedSystemElement: ManagedElement) /NetworkPort/eth0 <EthernetPort>  <DeviceID>eth0</>   <NetworkAddresses> <item>112233445566</> <item>aabbccffeeff</> </> <LinkTechnology value='2'>Ethernet</>  <Capabilities type='array'> <item value='3'>WakeOnLan</> </> <EnabledCapabilities type='array' />  </> LogicalDevice has a m:n Realizes association with Core:PhysicalElement, not sure how to model it in REST <PhysicalElement> <Manufacturer>Realtek Semiconductor Co., Ltd.</> <Model>RTL-8169 Gigabit Ethernet</> ... </> IPProtocolEndpoint: Core:ProtocolEndpoint: <IPProtocolEndpoint> <IPv4Address>1.2.3.4</> <SubnetMask>255.255.255.0</> <AddressOrigin value="4">DHCP</>  </> <IPProtocolEndpoint> <IPv6Address>1:2:3::4</> <PrefixLength>64</> <AddressOrigin value="8">IPv6AutoConfig</> </> interface configuration ----------------------- (IPAssignmentSettingData : SettingData: ManagedElement) /IPAssignmentSettingData/eth0 <IPAssignmentSettingData> <AddressOrigin value='4'>DHCP</> </> /IPAssignmentSettingData/eth0 <StaticIPAssignmentSettingData> <AddressOrigin value='3'>Static</> <IPv4Address>10.20.30.40</> <SubnetMask>255.255.0.0</> <GatewayIPv4Address>10.20.7.254</>  </> (WiFi is too new (Jun 2009): http://www.dmtf.org/standards/published_documents/DSP1088_1.0.0.pdf ) the Association ElementSettingData connects ManagedElement and SettingData (compare NetworkManager's ActiveConnection) <ElementSettingData> <ManagedElement>/IPProtocolEndpoint/1</> <SettingData>/IPAssignmentSettingData/eth0</> <IsDefault value="1">Is Default</>  <IsCurrent value="1">Is Current</> </> TODO! how is all this bound to /NetworkPort/eth0? SAPSAPDependency? ActiveConnection? resolver (DNS client) configuration ----------------------------------- (NETCONFIG_DNS_STATIC_SERVERS) /DNSSettingData <DNSSettingData> <AddressOrigin value='3'>Static</> <DNSServerAddresses type='array'>  <item>10.20.0.2</> <item>10.20.0.8</> </> </> (NETCONFIG_DNS_STATIC_SEARCHLIST) /DNSGeneralSettingData <DNSGeneralSettingData> <AddressOrigin value='3'>Static</> <AppendParentSuffixes type="boolean">true</> <DNSSuffixesToAppend type="array"> <item>suse.cz</> <item>suse.de</> </> </> (BTW it seems that netconfig does not enable dissassociating AddressOrigin for these two) /DNSSettingData <DNSSettingData> <AddressOrigin value='4'>DHCP</> </> /DNSGeneralSettingData <DNSGeneralSettingData> <AddressOrigin value='4'>DHCP</> </> (TODO: Virtual Devices, in case you haven't had enough) -- Martin Vidner, YaST developer http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

3 4

[yast-devel] Re: [yast-commit] <web-client> master : app/controllers/system_controller.rb - i18n support
by Josef Reidinger 17 Aug '09

17 Aug '09

On 08/17/2009 03:20 PM, Ladislav Slezak wrote: > ref: refs/heads/master > commit 802dfd6ed000459905a9c222f0fd34e8affc08b3 > Author: Ladislav Slezak <lslezak(a)novell.com> > Date: Mon Aug 17 15:08:09 2009 +0200 > > app/controllers/system_controller.rb - i18n support > --- > .../system/app/controllers/system_controller.rb | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/plugins/system/app/controllers/system_controller.rb b/plugins/system/app/controllers/system_controller.rb > index dc4a01f..8336d58 100644 > --- a/plugins/system/app/controllers/system_controller.rb > +++ b/plugins/system/app/controllers/system_controller.rb > @@ -2,6 +2,8 @@ > class SystemController < ApplicationController > before_filter :login_required > > + include GetText > + Hi, gettext is already included in Action Controller so you don't need include it. Only what should be usefull is initialize to own separated translation file via init_gettext _nameofmodule_ in class. (it is helper and couldn't go to initialize, see e.g. language or timezone module) -- Josef Reidinger YaST team maintainer of perl-Bootloader, YaST2-Repair, webyast modules language and time -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0

[yast-devel] Re: [yast-commit] <rest-service> master : custom-services rest plugin (originaly services plugin for fate 306696)
by Josef Reidinger 17 Aug '09

17 Aug '09

Hi, few comments On 08/17/2009 10:01 AM, Jiri Suchomel wrote: > ref: refs/heads/master > commit 51c4d88d32d55c56e38a96fd782310e8890e41ea > Author: Jiri Suchomel <jsuchome(a)suse.cz> > Date: Mon Aug 17 10:01:21 2009 +0200 > > custom-services rest plugin (originaly services plugin for fate 306696) > --- > plugins/custom_services/.gitignore | 3 + > plugins/custom_services/MIT-LICENSE | 20 +++++ > plugins/custom_services/README | 7 ++ > plugins/custom_services/Rakefile | 10 +++ > .../app/controllers/custom_services_controller.rb | 54 +++++++++++++ > .../custom_services/app/models/custom_service.rb | 70 ++++++++++++++++ > .../app/views/custom_services/index.html.erb | 1 + > .../app/views/custom_services/index.json.erb | 1 + > .../app/views/custom_services/index.xml.erb | 1 + > .../app/views/custom_services/show.html.erb | 1 + > .../app/views/custom_services/show.json.erb | 1 + > .../app/views/custom_services/show.xml.erb | 1 + > plugins/custom_services/config/rails_parent.rb | 15 ++++ > .../config/resources/custom_services.yml | 2 + > plugins/custom_services/init.rb | 1 + > plugins/custom_services/install.rb | 1 + > .../org.opensuse.yast.modules.yapi.services.policy | 39 +++++++++ > .../package/yast2-webservice-services.changes | 16 ++++ > .../package/yast2-webservice-services.spec | 83 ++++++++++++++++++++ > .../tasks/custom_services_tasks.rake | 6 ++ > .../functional/custom_services_controller_test.rb | 51 ++++++++++++ > plugins/custom_services/test/test_helper.rb | 52 ++++++++++++ > plugins/custom_services/uninstall.rb | 1 + > 23 files changed, 437 insertions(+), 0 deletions(-) > > <snip /> > diff --git a/plugins/custom_services/app/models/custom_service.rb b/plugins/custom_services/app/models/custom_service.rb > new file mode 100644 > index 0000000..26ce7ef > --- /dev/null > +++ b/plugins/custom_services/app/models/custom_service.rb > @@ -0,0 +1,70 @@ > +require 'yast_service' > + > +class CustomService > + > + attr_accessor :name > + attr_accessor :status > + > + def initialize > + end > + > + # services = CustomService.find_all > + def self.find_all This is not much convention for model. I think we should for better readiness use same method as do ActiveRecord...so instead find_all use find(:all) (use all as parameter) > + > + services = [] > + yapi_ret = YastService.Call("YaPI::SERVICES::Read") > + > +Rails.logger.debug "reading YAPI ----------------------------" > + > + if yapi_ret.nil? > + raise "Can't get services list" > + else > + yapi_ret.each do |s| > + service = CustomService.new > + service.name = s["name"] > + service.status = s["status"] > + Rails.logger.debug "service: #{service.inspect}" > + services << service > + end > + end > + services > + end > + > + # load the status of the service > + def self.find(id) > + yapi_ret = YastService.Call("YaPI::SERVICES::Get", id) > + > + raise "Got no data while loading service" if yapi_ret.empty? > + > + service = CustomService.new > + service.name = yapi_ret["name"] > + service.status = yapi_ret["status"] > + > + Rails.logger.debug service.inspect > + service > + end > + > + > + def save(cmd) > + ret = YastService.Call("YaPI::SERVICES::Execute", self.name, cmd) > + > + Rails.logger.debug "Command returns: #{ret.inspect}" > + ret > + end > + > + def to_xml( options = {} ) > + xml = options[:builder] ||= Builder::XmlMarkup.new(options) > + xml.instruct! unless options[:skip_instruct] > + > + xml.service do > + xml.tag!(:name, name ) > + xml.tag!(:status, status, {:type => "integer"} ) > + end > + end > + > + def to_json( options = {} ) > + hash = Hash.from_xml(to_xml()) > + return hash.to_json > + end > + > +end > new file mode 100644 > index 0000000..0f5d8ab > --- /dev/null > +++ b/plugins/custom_services/package/org.opensuse.yast.modules.yapi.services.policy > @@ -0,0 +1,39 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" > + "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> > + > +<policyconfig> > + <vendor>Novell, Inc.</vendor> > + <vendor_url>http://www.novell.com</vendor_url> > + > + <action id="org.opensuse.yast.modules.yapi.services.read"> > + <description>Get list of services.</description> > + <message>System policy prevents the Yast DBus service from reading service list.</message> > + <defaults> > + <allow_any>no</allow_any> > + <allow_inactive>no</allow_inactive> > + <allow_active>auth_admin_keep_session</allow_active> > + </defaults> > + </action> > + > + <action id="org.opensuse.yast.modules.yapi.services.get"> > + <description>Get the information about given service.</description> > + <message>System policy prevents the Yast DBus service from reading service info.</message> > + <defaults> > + <allow_any>no</allow_any> > + <allow_inactive>no</allow_inactive> > + <allow_active>auth_admin_keep_session</allow_active> > + </defaults> > + </action> > + > + <action id="org.opensuse.yast.modules.yapi.services.execute"> > + <description>Starting/stopping services.</description> > + <message>System policy prevents the Yast DBus service from executing service script.</message> > + <defaults> > + <allow_any>no</allow_any> > + <allow_inactive>no</allow_inactive> > + <allow_active>auth_admin_keep_session</allow_active> > + </defaults> > + </action> > +</policyconfig> > + We should unify location of policy files. I as yapi is reachable via dbus and uses policy kit I add it to directly to yast module. Maybe someone (Klaus?) should say where is correct location for this file. -- Josef Reidinger YaST team maintainer of perl-Bootloader, YaST2-Repair, webyast modules language and time -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

3 2

[yast-devel] Re: [yast-commit] <rest-service> master : custom-services rest plugin (originaly services plugin for fate 306696)
by Jiří Suchomel 17 Aug '09

17 Aug '09

On Monday 17 of August 2009 10:01:21 Jiri Suchomel wrote: > ref: refs/heads/master > commit 51c4d88d32d55c56e38a96fd782310e8890e41ea > Author: Jiri Suchomel <jsuchome(a)suse.cz> > Date: Mon Aug 17 10:01:21 2009 +0200 > > custom-services rest plugin (originaly services plugin for fate 306696) > --- > plugins/custom_services/.gitignore | 3 + > plugins/custom_services/MIT-LICENSE | 20 +++++ > plugins/custom_services/README | 7 ++ > plugins/custom_services/Rakefile | 10 +++ > .../app/controllers/custom_services_controller.rb | 54 +++++++++++++ > .../custom_services/app/models/custom_service.rb | 70 ++++++++++++++++ > .../app/views/custom_services/index.html.erb | 1 + > .../app/views/custom_services/index.json.erb | 1 + > .../app/views/custom_services/index.xml.erb | 1 + > .../app/views/custom_services/show.html.erb | 1 + > .../app/views/custom_services/show.json.erb | 1 + > .../app/views/custom_services/show.xml.erb | 1 + > plugins/custom_services/config/rails_parent.rb | 15 ++++ > .../config/resources/custom_services.yml | 2 + > plugins/custom_services/init.rb | 1 + > plugins/custom_services/install.rb | 1 + > .../org.opensuse.yast.modules.yapi.services.policy | 39 +++++++++ > .../package/yast2-webservice-services.changes | 16 ++++ > .../package/yast2-webservice-services.spec | 83 > ++++++++++++++++++++ .../tasks/custom_services_tasks.rake | > 6 ++ > .../functional/custom_services_controller_test.rb | 51 ++++++++++++ > plugins/custom_services/test/test_helper.rb | 52 ++++++++++++ > plugins/custom_services/uninstall.rb | 1 + > 23 files changed, 437 insertions(+), 0 deletions(-) > ... Hi! I just added new plugin, created from old one by copying and sed-ing... Could you help me to see why tests fail with test_access_index(CustomServicesControllerTest): ActionController::RoutingError: No route matches {:controller=>"custom_services", :action=>"index"} Is it some naming convention problem? Jiri -- Jiri Suchomel SUSE LINUX, s.r.o. e-mail: jsuchome(a)suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Praha 9, Czech Republic http://www.suse.cz -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

3 2

[yast-devel] webYaST: network CIM model summary
by Michal Zugec 17 Aug '09

17 Aug '09

UI mockup --------- http://mschmidkunz.110mb.com/network.html Requirements ------------ There were some requirements: - only "eth" devices (no wireless, no bridges, no vlans) - configure one or none device - no global settings (networkmanager, disable ipv6, dhcp options) - ifup only - device can be configured via DHCP or with address(IPv4 or IPv6) - no "no address" option, no additional addresses, no ifplugd, STARTMODE=onboot by default - nameserver - use "old YaST" options - route - setup only default route (no additional routes, no metrics) The meaning of this module is to set machine to be "connected", accessible via ssh - that's all. For all other, special, "expert" setup is here old YaST CIM model --------- Network is defined in CIM model widely: http://www.wbemsolutions.com/tutorials/CIM/cim-model-net.html But what we need is only about 10-20% of that. It's because there are parameters needed for several network devices, routers, wireless AP, switches, network infrastructure definition, ... We have package "cim-schema" in distribution with some interesting .mof files. Some of them are deprecated! /usr/share/mof/cimv2.19.1/Device/CIM_EthernetPort.mof ethernet device - only interesting is MAC address /usr/share/mof/cimv2.19.1/Device/CIM_NetworkPort.mof almost the same with higher abstraction /usr/share/mof/cimv2.19.1/Network/CIM_IPConfigurationService.mof in the future may be deprecated (but without information what we should use instead of it) network configuration, IP address settings /usr/share/mof/cimv2.19.1/Network/CIM_IPAssignmentSettingData.mof this is equal to our BOOTPROTO parameter /usr/share/mof/cimv2.19.1/Network/CIM_IPProtocolEndpoint.mof don't know difference between this and CIM_IPConfigurationService (but this is more similar to our configurations) /usr/share/mof/cimv2.19.1/Network/CIM_NetworkVLAN.mof VLAN settings (but there are no .mof files for other network types - bridge, bonding, ...) There are also some mof files for DNS (resolv.conf) settings /usr/share/mof/cimv2.19.1/Network/CIM_DNSGeneralSettingData.mof /usr/share/mof/cimv2.19.1/Network/CIM_DNSProtocolEndpoint.mof /usr/share/mof/cimv2.19.1/Network/CIM_DNSSettingData.mof As Klaus suggested, we'll use option names (in rest-api) based on names from CIM model. Bye, Michal -- Best Regards, Michal Zugec Software developer --------------------------------------------------------------------- SuSE CR, s.r.o. e-mail: mzugec(a)suse.cz Lihovarska 1060/12 tel: +420 284 028 960 190 00 Praha 9 fax: +420 296 542 374 Czech Republic http://www.suse.cz/ -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

3 2

[yast-devel] WebYaST daily status, minutes taker schedule
by Klaus Kaempf 17 Aug '09

17 Aug '09

Hi, the WebYaST project page (http://en.opensuse.org/YaST/Web/Project) now contains the schedule for taking the meeting minutes. Klaus -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0

[yast-devel] WebYaST daily status, 14-Aug-2009
by Bjoern Geuken 17 Aug '09

17 Aug '09

kkaempf: - wiki cleanup - task list has some new entrys, look onto it - discuss break build: work in branch first, merge, use test suit and then merge back dmacvicar: - need requirements for custom services - fixed broken build on friday next: - get things to green again - will make Hudson send to Yast commit Schubi: - looked at sinatra and selenium - had some problems with details in sinatra next: - try to solve them today or otherwise will chancel sinatry mschmidkunz: - worked on workflow and ui presentation, license next: - basic system bgeuken: - worked on status module next: - work on status module Martin V.: next: - try to complete model jreidinger: - added rest module basic system setup jsrain: (no update) mzugec: - working with martin - added api devices - asked ideas in mail jsuchome: - broke build - use of Yapi is still unclear lslezak: - worked on webclient - fixed plugin loading -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0

[yast-devel] Re: [yast-commit] <web-client> master : custom-services client
by Josef Reidinger 17 Aug '09

17 Aug '09

On 08/17/2009 10:02 AM, Jiri Suchomel wrote: > ref: refs/heads/master > commit 89703cf8f4b2848c1bfbdb71de8df8414d0f5a96 > Author: Jiri Suchomel <jsuchome(a)suse.cz> > Date: Mon Aug 17 10:02:18 2009 +0200 > > custom-services client > --- > plugins/custom_services/README | 7 ++ > plugins/custom_services/Rakefile | 10 +++ > .../app/controllers/custom_services_controller.rb | 67 ++++++++++++++++++ > .../app/views/custom_services/_result.rhtml | 20 ++++++ > .../app/views/custom_services/index.rhtml | 70 +++++++++++++++++++ > plugins/custom_services/config/rails_parent.rb | 15 ++++ > plugins/custom_services/init.rb | 12 +++ > plugins/custom_services/install.rb | 1 + > .../yast2-webclient-custom-services.changes | 4 + > .../package/yast2-webclient-custom-services.spec | 73 ++++++++++++++++++++ > plugins/custom_services/shortcuts.yml | 8 ++ > .../tasks/custom_services_tasks.rake | 6 ++ > .../custom_services/test/custom_services_test.rb | 8 ++ > .../functional/custom_services_controller_test.rb | 45 ++++++++++++ > plugins/custom_services/test/test_helper.rb | 19 +++++ > plugins/custom_services/uninstall.rb | 1 + > 16 files changed, 366 insertions(+), 0 deletions(-) > > diff --git a/plugins/custom_services/README b/plugins/custom_services/README > new file mode 100644 > index 0000000..afbf229 > --- /dev/null > +++ b/plugins/custom_services/README > @@ -0,0 +1,7 @@ > +Services > +========= > + > +Plugin for hanling custom vendor service. > + > + > +Copyright (c) 2009 Novell, released under the MIT license > diff --git a/plugins/custom_services/Rakefile b/plugins/custom_services/Rakefile > new file mode 100644 > index 0000000..ca63e76 > --- /dev/null > +++ b/plugins/custom_services/Rakefile > @@ -0,0 +1,10 @@ > +require 'rake' > +require 'rake/testtask' > +require 'rake/rdoctask' > +require File.join(File.dirname(__FILE__), 'config', 'rails_parent') > +require File.join(RailsParent.parent, 'config', 'boot') > +require 'tasks/rails' > + > +desc 'Default: run unit tests.' > +task :default => :test > + > diff --git a/plugins/custom_services/app/controllers/custom_services_controller.rb b/plugins/custom_services/app/controllers/custom_services_controller.rb > new file mode 100644 > index 0000000..518bccd > --- /dev/null > +++ b/plugins/custom_services/app/controllers/custom_services_controller.rb > @@ -0,0 +1,67 @@ > +require 'yast/service_resource' > + > +class CustomServicesController < ApplicationController > + before_filter :login_required > + layout 'main' > + > + private > + def client_permissions > + @client = YaST::ServiceResource.proxy_for('org.opensuse.yast.modules.yapi.services') > + unless @client > + flash[:notice] = _("Invalid session, please login again.") > + redirect_to( logout_path ) and return > + end > + @permissions = @client.permissions > + end I recommend using proxy_loader library. That handle properly all stuff with loading proxy and also ensure same behavior for all plugins. It is well documented with examplanation example. > + > + # Initialize GetText and Content-Type. > + init_gettext "yast_webclient_custom_service" # textdomain, options(:charset, :content_type) > + > + public > + > + def initialize > + end > + > + # GET /services > + # GET /services.xml > + def index > + return unless client_permissions > + @services = [] > +logger.debug "-------------------------------- index" > + > + begin > + @services = @client.find(:all) > + rescue ActiveResource::ClientError => e > + flash[:error] = YaST::ServiceResource.error(e) > + end > +logger.debug @services.inspect > + > + respond_to do |format| > + format.html # index.html.erb > + format.xml { render :xml => @services } > + end > + end > + > + def execute > + return unless client_permissions > + @service = @client.find(params[:service_id]) > + > + response = @client.put(params[:service_id], :execute => params[:id]) > + > + # we get a hash with exit, stderr, stdout > + ret = Hash.from_xml(response.body) > + ret = ret["hash"] > + logger.debug "returns #{ret.inspect}" > + > + @result_string = "" > + @result_string << ret["stdout"] if ret["stdout"] > + @result_string << ret["stderr"] if ret["stderr"] > + @error_string = ret["exit"].to_s > + if ret["exit"] == 0 > + @error_string = _("success") > + end > + render(:partial =>'result') > + end > + > + > +end > diff --git a/plugins/custom_services/app/views/custom_services/_result.rhtml b/plugins/custom_services/app/views/custom_services/_result.rhtml > new file mode 100644 > index 0000000..3af3d5f > --- /dev/null > +++ b/plugins/custom_services/app/views/custom_services/_result.rhtml > @@ -0,0 +1,20 @@ > + <div class="box"> > + <div class="table"> > + <img src="images/bg-th-left.gif" width="8" height="7" alt="" class="left" /> > + <img src="images/bg-th-right.gif" width="7" height="7" alt="" class="right" /> > + <table class="listing form" cellpadding="0" cellspacing="0"> > + <tr> > + <th class="full" colspan="2"><%=_("Service Call Result")%></th> > + </tr> > + <tr> > + <td class="first" width="120"><strong><%=_("Result")%></strong></td> > + <td class="last"><%=h @error_string %></td> > + </tr> > + <tr class="bg"> > + <td class="first"><strong><%=_("Description")%></strong></td> > + <td class="last"><%=h @result_string %></td> > + </tr> > + </table> > + <p><a href="services" class="button"><%=_("Back")%></a></p> > + </div> > + </div> > \ No newline at end of file > diff --git a/plugins/custom_services/app/views/custom_services/index.rhtml b/plugins/custom_services/app/views/custom_services/index.rhtml > new file mode 100644 > index 0000000..7498013 > --- /dev/null > +++ b/plugins/custom_services/app/views/custom_services/index.rhtml > @@ -0,0 +1,70 @@ > +<%= javascript_include_tag :defaults %> I think you don't want this, this is helper for AJAX stuff (loads all necessary libs for working AJAX helpers) . Your library I think is included already from template. > + > +<script language="javascript"> > + > + YAHOO.namespace('yuiresult'); > + > + function initResultDialog() { > + var handleCancel = function() { > + this.cancel(); > + } > + > + YAHOO.yuiresult.resultDialog = new YAHOO.widget.Dialog("resultdlg", { > + width: "625px", > + modal: true, > + visible: false, > + fixedcenter: true, > + constraintoviewport: true, > + draggable: true }); > + > + YAHOO.yuiresult.resultDialog.render(); > + } > + > + function showResultDialog() { > + YAHOO.yuiresult.resultDialog.show(); > + } > + > + YAHOO.util.Event.addListener(window, "load", initResultDialog); > +</script> > + We have YAHOO js lib? I think we remove it. At least it should be good if we document what libraries is used in webyast and what should other module use. > + > +<div id="resultdlg"> > +</div> > + > + > +<div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div> > +<div class='plugin-content'> > + > +<h2><%=_("The full name of vendor service here")%></h2> > +<br> > + > +<% if ! @permissions[:execute] %> unless is common in ruby > +<p><%=_("You do not have permission to execute the service. The links are disabled.")%></p> > +<% end %> > + > +<ul> > +<% @services.each do |service| %> > +<li><b><%=h service.name %></b> > + <% [ "start", "stop" ].each do |cmd| > + if @permissions[:execute] %> > + <%= > + link_to_remote cmd, > + :update => "resultdlg", > + :url=>{ :id=> cmd, > + :action => "execute", > + :service_id=> service.name > + } > +# :loading => "Element.show('progress')" > +# :complete => "Element.hide('progress'); showResultDialog();" > + %> > + <% > + else %> > + <span style="color: #BDBDBD"><%="#{cmd}" -%></span> I think we should not use hardcoded style, I think better is send mail to robert and choose some class for this case. > + <% > + end > + end %> > +</li> > +<% end %> > +</ul> > + > +</div> -- Josef Reidinger YaST team maintainer of perl-Bootloader, YaST2-Repair, webyast modules language and time -- To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org

1 0