ref: refs/heads/master
commit 3da38989d965ed333dd904ed0842af15a0003f8c
Author: Stefan Schubert
Date: Fri Oct 23 18:31:05 2009 +0200
showing changed services too
---
.../app/controllers/registration_controller.rb | 2 ++
.../app/views/registration/index.rhtml | 15 +++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb
index 75f6bfc..2553652 100644
--- a/plugins/registration/app/controllers/registration_controller.rb
+++ b/plugins/registration/app/controllers/registration_controller.rb
@@ -73,11 +73,13 @@ class RegistrationController < ApplicationController
}
@changed_repositories = []
+ @changed_services = []
begin
register = @client.create({:arguments=>@arguments,
:options=>@options})
logger.debug "registration finished: #{register.to_xml}"
@changed_repositories = register.changedrepos if register.respond_to? :changedrepos
+ @changed_services = register.changedservices if register.respond_to? :changedservices
flash[:notice] = _("Registration finished successfully.")
rescue ActiveResource::ClientError => e
error = Hash.from_xml(e.response.body)["registration"]
diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml
index 1e405fd..317aa50 100644
--- a/plugins/registration/app/views/registration/index.rhtml
+++ b/plugins/registration/app/views/registration/index.rhtml
@@ -31,6 +31,21 @@
</tr>
<% end %>
<% end %>
+ <% unless @changed_services.blank? %>
+ <tr><td height=10></td></tr>
+ <% first=true %>
+ <% for service in @changed_services %>
+ <tr>
+ <% if first %>
+ <td><strong><%=_("Changed Services")%></strong></td>
+ <% first=false %>
+ <% else %>
+ <td></td>
+ <% end %>
+ <td><%= service.alias %> (<%= service.status %>)</td>
+ </tr>
+ <% end %>
+ <% end %>
</table>
<br/>
<%= submit_tag _("Register"), :onclick=>"Element.show('progress')", :class => 'button' -%>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org