ref: refs/heads/master
commit 2b2d5512dc979005d556916937a7c89b668de103
Author: Stefan Schubert
Date: Mon Nov 2 11:57:56 2009 +0100
added a detail button
---
.../app/controllers/registration_controller.rb | 16 +++++++++++++++-
.../app/views/registration/index.rhtml | 10 +++++++++-
.../package/yast2-webclient-registration.changes | 5 +++++
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb
index 738493e..9c4f592 100644
--- a/plugins/registration/app/controllers/registration_controller.rb
+++ b/plugins/registration/app/controllers/registration_controller.rb
@@ -32,6 +32,12 @@ class RegistrationController < ApplicationController
def index
return unless client_permissions
+ if action_name == "detail"
+ @detail = true
+ else
+ @detail = false
+ end
+
unless @permissions[:statelessregister]
flash[:warning] = _("No permissions for registration")
redirect_to root_path
@@ -52,12 +58,18 @@ class RegistrationController < ApplicationController
redirect_to root_path
return false
end
- end
+ end
+ end
+
+ def detail
+ index
+ render :action => "index"
end
# Calling the register over the service
def update
return unless client_permissions
+ @detail = false
unless @permissions[:statelessregister]
flash[:warning] = _("No permissions for registration")
@@ -94,6 +106,8 @@ class RegistrationController < ApplicationController
missed_args.each {|missed_arg|
if missed_arg["name"] == argument["name"]
argument["error"] = true #flag error for already existing argument
+ argument["flag"] = missed_arg["flag"]
+ argument["kind"] = missed_arg["kind"]
missed_args.reject! {|del_arg| del_arg["name"] == argument["name"] }
break
end
diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml
index 12b46c5..07e7795 100644
--- a/plugins/registration/app/views/registration/index.rhtml
+++ b/plugins/registration/app/views/registration/index.rhtml
@@ -7,7 +7,7 @@
">
<tr><td colspan="2" class="full" align="center"></td></tr>
<% for argument in @arguments %>
- <% if argument["flag"] == "m" %>
+ <% if argument["flag"] == "m" || @detail%>
<tr>
<% if argument["error"] %>
<td><strong><font color=red><%=_(argument["name"])%></font></strong></td>
@@ -50,9 +50,17 @@
</tr>
<% end %>
<% end %>
+ <% unless @detail || controller.action_name == "update"%>
+ <tr><td height=10></td></tr>
+ <tr>
+ <td></td>
+ <td align="right"><%= link_to _('Detail'), {:controller => :registration, :action =>:detail}, :onclick=>"Element.show('progress')", :class => "button"%></p></td>
+ </tr>
+ <% end %>
</table>
<br/>
<%= form_send_buttons %>
+
<% end -%>
</div>
diff --git a/plugins/registration/package/yast2-webclient-registration.changes b/plugins/registration/package/yast2-webclient-registration.changes
index b971bc0..60e58d0 100644
--- a/plugins/registration/package/yast2-webclient-registration.changes
+++ b/plugins/registration/package/yast2-webclient-registration.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Nov 2 11:57:33 CET 2009 - schubi@suse.de
+
+- added a "detail" button
+
+-------------------------------------------------------------------
Thu Oct 29 14:30:11 CEST 2009 - jdsn@suse.de
- version 0.0.2
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org