July 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58113 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 18 Jul '09

18 Jul '09

Author: locilka Date: Sat Jul 18 10:20:52 2009 New Revision: 58113 URL: http://svn.opensuse.org/viewcvs/yast?rev=58113&view=rev Log: New version to build Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=58113&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Sat Jul 18 10:20:52 2009 @@ -1 +1 @@ -2.18.18 +2.18.19 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Sat Jul 18 10:20:52 2009 @@ -4,6 +4,7 @@ - Fixed Welcome dialog layout to have more license content visible and to align language and keyboard widgets with it. - Not offering installation images if there are none (bnc #492745). +- 2.18.19 ------------------------------------------------------------------- Mon Jun 22 20:20:18 CEST 2009 - coolo(a)novell.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Disable password input helper, bnc#523122
by Klaus Kämpf 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 4b627229627e5510bf05e07d5a970a6f4fb30015 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Fri Jul 17 18:22:47 2009 +0200 Disable password input helper, bnc#523122 --- webclient/app/views/layouts/main.rhtml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 4b97532..0b5b68b 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -16,7 +16,7 @@ <script type="text/javascript" charset="utf-8" src="/javascripts/plugin/jqplot.pieRenderer.js"></script> <script type="text/javascript" charset="utf-8" src="/inc/jquery.ui.custom.js"></script> - <script type="text/javascript" charset="utf-8" src="/javascripts/jQuery.dPassword.js"></script> +  <script type="text/javascript" charset="utf-8" src="/javascripts/script.js"></script> <!--<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.jqModal.js"></script> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Clear flash message after display
by Klaus Kämpf 17 Jul '09

17 Jul '09

ref: refs/heads/master commit a1d4d55f265606b6a35ab9dd4feea2fc65d2c749 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Fri Jul 17 18:09:38 2009 +0200 Clear flash message after display Huh, this should be handled by Rails somehow. For now, I consider it a workaround. --- webclient/app/views/layouts/main.rhtml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 829e3fa..4b97532 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -60,6 +60,7 @@ <% [:error, :warning, :notice, :message].each do |name| %> <% if flash[name] %> <%= "<div class=\"notifications\" id=\"#{name}\">#{flash[name]}</div>" %> + <% flash.delete name -%> <% end %> <% end %> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Reorder flash output, most severe (:error) first
by Klaus Kämpf 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 563286fc94d485ddbbc30a3810cee20d48100480 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Fri Jul 17 18:05:46 2009 +0200 Reorder flash output, most severe (:error) first --- webclient/app/views/layouts/main.rhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml index 6c12d60..829e3fa 100644 --- a/webclient/app/views/layouts/main.rhtml +++ b/webclient/app/views/layouts/main.rhtml @@ -57,11 +57,11 @@ <div id="content" class="content">  - <% [:notice, :warning, :message, :error].each do |name| %> + <% [:error, :warning, :notice, :message].each do |name| %> <% if flash[name] %> <%= "<div class=\"notifications\" id=\"#{name}\">#{flash[name]}</div>" %> - <% end %> <% end %> + <% end %> <div id="progress" style="display:none;"> <%= image_tag("/images/working.gif") %><%=_("...Wait...")%> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Set error when redirecting to hosts controller
by Klaus Kämpf 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 1f58657c3a784fac14719fe8e9aeaf12139b417a Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Fri Jul 17 18:04:39 2009 +0200 Set error when redirecting to hosts controller --- webclient/app/controllers/hosts_controller.rb | 2 ++ webclient/app/controllers/sessions_controller.rb | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/webclient/app/controllers/hosts_controller.rb b/webclient/app/controllers/hosts_controller.rb index 8ff6c7d..3dfb9a1 100644 --- a/webclient/app/controllers/hosts_controller.rb +++ b/webclient/app/controllers/hosts_controller.rb @@ -24,6 +24,8 @@ class HostsController < ApplicationController host = Host.find(params[:hostid]) rescue nil flash[:error] = _("Can't connect to host #{host.name}.") if host flash[:warning] = _("Make sure the host is up and that the YaST web service is running.") + elsif error == "nohostid" + flash[:notice] = _("Please select a host to connect to.") end end diff --git a/webclient/app/controllers/sessions_controller.rb b/webclient/app/controllers/sessions_controller.rb index 9dc5cd4..e505129 100644 --- a/webclient/app/controllers/sessions_controller.rb +++ b/webclient/app/controllers/sessions_controller.rb @@ -29,12 +29,13 @@ class SessionsController < ApplicationController return end + # Set @host to display info at login screen @host = Host.find(params[:hostid]) rescue nil + # if the hostname is not set, go to the host controller # to pickup a service unless @host - flash[:notice] = _("Please select a host to connect to.") unless flash[:notice] - redirect_to :controller => 'hosts', :action => 'index' + redirect_to :controller => 'hosts', :action => 'index', :error => "nohostid" return end @@ -67,8 +68,7 @@ class SessionsController < ApplicationController # error handling when login to the service is pretty # important to get meaningful error messages to the user rescue Errno::ECONNREFUSED => e - flash[:error] = _("Can't connect to host at #{host.name}, make sure the host is up and that the YaST web service is running.") - redirect_to :action => "new" + redirect_to :controller => "hosts", :action => "index", :hostid => host.id, :error => "econnrefused" return rescue Exception => e logger.warn e.to_s -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : Allow to pass error and hostid
by Klaus Kämpf 17 Jul '09

17 Jul '09

ref: refs/heads/master commit 27f6f77de7ab75535568a40239b4b250f0910a77 Author: Klaus Kämpf <kkaempf(a)suse.de> Date: Fri Jul 17 17:59:54 2009 +0200 Allow to pass error and hostid Error messages via flash[] do not survive change of controller. On login failure (session controller), one is pushed back to choose another host (hosts controller). So login failures must passed via ?error= --- webclient/app/controllers/hosts_controller.rb | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/webclient/app/controllers/hosts_controller.rb b/webclient/app/controllers/hosts_controller.rb index 89e06a9..8ff6c7d 100644 --- a/webclient/app/controllers/hosts_controller.rb +++ b/webclient/app/controllers/hosts_controller.rb @@ -3,7 +3,11 @@ require 'uri' class HostsController < ApplicationController layout 'main' + # # GET /hosts + # Display list of hosts for user to choose (or add) + # params :error, :hostid, set if previously choosen host is wrong + # def index begin @hosts = Host.find(:all) @@ -12,6 +16,15 @@ class HostsController < ApplicationController # show nice error screen and remind to "rake db:migrate" redirect_to "/migration_missing" end + + # error is set if session couldn't be established and user has to re-choose the host + # flash[] doesn't survive redirects across controllers :-( + error = params[:error] + if error == "econnrefused" + host = Host.find(params[:hostid]) rescue nil + flash[:error] = _("Can't connect to host #{host.name}.") if host + flash[:warning] = _("Make sure the host is up and that the YaST web service is running.") + end end # GET /hosts/show/1 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : showing system information in the control center
by Stefan Schubert 17 Jul '09

17 Jul '09

ref: refs/heads/master commit bf3dee75675490229d926a4ea9c411ef770f63dc Author: Stefan Schubert <schubi(a)suse.de> Date: Fri Jul 17 16:07:37 2009 +0200 showing system information in the control center --- .../status/app/controllers/status_controller.rb | 58 ++++++++++++++++---- .../app/views/status/_status_summary.html.erb | 16 ++++++ plugins/status/app/views/status/edit.html.erb | 4 +- webclient/app/views/controlpanel/index.rhtml | 24 ++++++--- webclient/public/stylesheets/yast.css | 4 ++ 5 files changed, 87 insertions(+), 19 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index 1e4445c..29c6503 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -108,9 +108,9 @@ class StatusController < ApplicationController else logger.error "empty key: #{@key} #{list.inspect}" end -# logger.debug "System information: #{(a)data_group[key_split[1]].inspect}" end logger.debug "Limits: #{(a)limits.inspect}" +# logger.debug "System information: #{(a)data_group.inspect}" true end @@ -121,7 +121,6 @@ class StatusController < ApplicationController status.delete(key) elsif next_label = label+ "/" + key - create_save_data(value, params, next_label) if value.is_a? Hash end end @@ -143,30 +142,69 @@ class StatusController < ApplicationController init_gettext "yast_webclient_status" public + def initialize end def edit return unless client_permissions - create_data() + create_data end def index return unless client_permissions - create_data() + create_data + end - respond_to do |format| - format.html # index.html.erb - format.xml { render :xml => @users } + + def show_summary + return unless client_permissions + unless create_data + erase_redirect_results #reset all redirects + erase_render_results + flash.clear #no flash from load_proxy + render :partial => "status_summary", :locals => { :status => nil } + return false + end + status = "" + @data_group.each do |key, map| + error_found = false + map.each do |graph_key, list_value| + limit_key = "/#{key}/#{graph_key}" + if @limits_list.has_key?(limit_key) + cmp_value = @limits_list[limit_key][0][1] #take thatone cause it has already the right format + #( e.g. MByte for memory) + list_value.each do |value| + if (@limits[limit_key]["maximum"] && value[1]>= cmp_value) || + (!@limits[limit_key]["maximum"] && value[1]<= cmp_value) + error_found = true + break + end + end + end + end + if error_found + status += "; " unless status.blank? + status += key + " " + _("limits exceeded") + end end - end + render :partial => "status_summary", :locals => { :status => status } + end def save return unless client_permissions - create_data() + begin + till = Time.new + from = till - 300 #last 5 minutes + + status = @client.find(:dummy_param, :params => { :start => from.strftime("%H:%M,%m/%d/%Y"), :stop => till.strftime("%H:%M,%m/%d/%Y") }) + + rescue ActiveResource::ClientError => e + flash[:error] = YaST::ServiceResource.error(e) + return false + end - status = @client.find() save_hash = create_save_data(Hash.from_xml(status.to_xml)["status"], params) logger.debug "writing #{save_hash.inspect}" diff --git a/plugins/status/app/views/status/_status_summary.html.erb b/plugins/status/app/views/status/_status_summary.html.erb new file mode 100644 index 0000000..78d2b6c --- /dev/null +++ b/plugins/status/app/views/status/_status_summary.html.erb @@ -0,0 +1,16 @@ +<div class="status_status"> + <% unless status %> + <img src="/images/button_warning.png" alt="warning icon" /> + <%= _("Error occur during loading status information.") %> + <% else %> + <% link_to "status" do %> + <% if !status.blank? %> + <img src="/images/button_critical.png" alt="error found"/> + <%= status %> + <% else %> + <img src="/images/button_ok.png" alt="Your system is healthy"/> + <%= _("Your system is healthy.") %> + <% end %> + <% end %> + <% end %> +</div> diff --git a/plugins/status/app/views/status/edit.html.erb b/plugins/status/app/views/status/edit.html.erb index f85e100..07f0ae0 100644 --- a/plugins/status/app/views/status/edit.html.erb +++ b/plugins/status/app/views/status/edit.html.erb @@ -18,7 +18,7 @@ <% if @limits_list.has_key?(limit_key) %> <td> - <input name=<%= limit_key+"/value" %> type="text" size="10" maxlength="15" value=<%= @limits[limit_key]["value"] %>> + <input name=<%= limit_key+"/value" %> type="text" size="10" maxlength="15" value=<%= @limits_list[limit_key][0][1] %>> </td> <td> <input type="checkbox" name= <%= limit_key+"/maximum" %> id=<%= limit_key+"/maximum" %> value="true" @@ -38,7 +38,7 @@ <% end %> <% end %> </table> -<%= submit_tag _("Save"), :onclick=>"Element.show('progress')", :disabled=> disabled, :class => 'button' -%> +<%= submit_tag _("Save"), :disabled=> disabled, :class => 'button' -%> <% end -%> diff --git a/webclient/app/views/controlpanel/index.rhtml b/webclient/app/views/controlpanel/index.rhtml index 2012ba1..014247c 100644 --- a/webclient/app/views/controlpanel/index.rhtml +++ b/webclient/app/views/controlpanel/index.rhtml @@ -8,21 +8,31 @@ <% end -%> <% end %> +<% if ActionController::Routing.possible_controllers.include?("status") %> + <% javascript_tag do -%> + $(document).ready( function() { + <%= remote_function(:update => "status_status", + :url => { :controller => :status, :action => :show_summary }) %> + }); + <% end -%> +<% end %> + <h3><img src="/images/monitoring.png" height="23" width="23" border="0" /> <%= _("Status") %></h3> <div id="status_patches"> <% if ActionController::Routing.possible_controllers.include?("patch_updates") %> - <img src="/images/working.gif" height="32" width="32" border="0" /> Loading informations about patches + <img src="/images/working.gif" height="32" width="32" border="0" /> Loading patch information <% else %> Patch plugin is not installed. <% end %> </div> -<br /> -<div id="status_health_icon"> - <img src="/images/button_ok.png" height="32" width="32" border="0" /> -</div> -<div id="status_health_msg"> - <a href=""><%= _("Your system is healthy.") %></a> +<br/> +<div id="status_status"> + <% if ActionController::Routing.possible_controllers.include?("status") %> + <img src="/images/working.gif" height="32" width="32" border="0" /> Loading system information + <% else %> + Status plugin is not installed. + <% end %> </div> <div id="favorites"> diff --git a/webclient/public/stylesheets/yast.css b/webclient/public/stylesheets/yast.css index 59f90e4..e1ccb70 100644 --- a/webclient/public/stylesheets/yast.css +++ b/webclient/public/stylesheets/yast.css @@ -41,6 +41,10 @@ margin-left: 2em; } +#status_status { + margin-left: 2em; +} + #status_health_icon { margin-left: 2em; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58112 - /tags/stable-2_18_12/country/
by jsuchome＠svn.opensuse.org 17 Jul '09

17 Jul '09

Author: jsuchome Date: Fri Jul 17 16:00:56 2009 New Revision: 58112 URL: http://svn.opensuse.org/viewcvs/yast?rev=58112&view=rev Log: Created tag stable-2_18_12 for country Added: tags/stable-2_18_12/country/ - copied from r58111, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58111 - /trunk/country/VERSION
by jsuchome＠svn.opensuse.org 17 Jul '09

17 Jul '09

Author: jsuchome Date: Fri Jul 17 16:00:51 2009 New Revision: 58111 URL: http://svn.opensuse.org/viewcvs/yast?rev=58111&view=rev Log: 2.18.12 Modified: trunk/country/VERSION Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=58111&r1=581… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Fri Jul 17 16:00:51 2009 @@ -1 +1 @@ -2.18.11 +2.18.12 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r58110 - in /trunk/country: package/yast2-country.changes yast2-country.spec.in
by jsuchome＠svn.opensuse.org 17 Jul '09

17 Jul '09

Author: jsuchome Date: Fri Jul 17 15:58:57 2009 New Revision: 58110 URL: http://svn.opensuse.org/viewcvs/yast?rev=58110&view=rev Log: - yast2-packager required for PackageSlideShow.ycp - 2.18.12 Modified: trunk/country/package/yast2-country.changes trunk/country/yast2-country.spec.in Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Fri Jul 17 15:58:57 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 17 13:47:26 CEST 2009 - jsuchome(a)suse.cz + +- yast2-packager required for PackageSlideShow.ycp +- 2.18.12 + +------------------------------------------------------------------- Thu Jul 16 12:50:43 CEST 2009 - jsuchome(a)suse.cz - correct path to xset binary (bnc#522615) Modified: trunk/country/yast2-country.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/yast2-country.spec.in?re… ============================================================================== --- trunk/country/yast2-country.spec.in (original) +++ trunk/country/yast2-country.spec.in Fri Jul 17 15:58:57 2009 @@ -6,8 +6,8 @@ #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings -Requires: yast2-trans-stats yast2-perl-bindings timezone +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings yast2-packager +Requires: yast2-trans-stats yast2-perl-bindings timezone yast2-packager # XVersion.ycp Requires: yast2 >= 2.13.70 # Pkg::SetPackageLocale, Pkg::GetTextLocale -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0