ref: refs/heads/use-activeresource commit 6a98dffbb77d1c3267f8e09b7017643217a92c9e Author: Josef Reidinger Date: Mon Aug 17 15:16:22 2009 +0200 Don't use private routing in users frontend --- plugins/users/app/views/users/edit.html.erb | 2 +- plugins/users/app/views/users/index.html.erb | 2 +- plugins/users/app/views/users/new.html.erb | 2 +- plugins/users/config/routes.rb | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/plugins/users/app/views/users/edit.html.erb b/plugins/users/app/views/users/edit.html.erb index f5c402d..4a99bac 100644 --- a/plugins/users/app/views/users/edit.html.erb +++ b/plugins/users/app/views/users/edit.html.erb @@ -44,6 +44,6 @@ <td class="last"><%= f.password_field :user_password, :disabled => disabled %></td> </tr> </table> - <p><%= f.submit _("Update"), :disabled => disabled %><%= link_to _('Back'), users_path, :onclick=>"Element.show('progress')", :class => "button"%></p> + <p><%= f.submit _("Update"), :disabled => disabled %><%= link_to _('Back'), {:action => :index}, :onclick=>"Element.show('progress')", :class => "button"%></p> </div> <% end %> diff --git a/plugins/users/app/views/users/index.html.erb b/plugins/users/app/views/users/index.html.erb index f4a3798..4b95317 100644 --- a/plugins/users/app/views/users/index.html.erb +++ b/plugins/users/app/views/users/index.html.erb @@ -26,7 +26,7 @@ <% if @permissions[:useradd] %> <div class="select"> - <%= link_to _("<strong>[New User]</strong>"), new_user_path, :onclick=>"Element.show('progress')" -%><p/> + <%= link_to _("<strong>[New User]</strong>"), {:action => :new}, :onclick=>"Element.show('progress')" -%><p/> </div> <% end %> diff --git a/plugins/users/app/views/users/new.html.erb b/plugins/users/app/views/users/new.html.erb index faf9713..9b81d49 100644 --- a/plugins/users/app/views/users/new.html.erb +++ b/plugins/users/app/views/users/new.html.erb @@ -42,6 +42,6 @@ <td class="last"><%= f.password_field :user_password %></td> </tr> </table> - <p><%= f.submit _("Create"), :onclick=>"Element.show('progress')" %><%= link_to _('Back'), users_path, :onclick=>"Element.show('progress')", :class => "button" %></p> + <p><%= f.submit _("Create"), :onclick=>"Element.show('progress')" %><%= link_to _('Back'), {:action => :index }, :onclick=>"Element.show('progress')", :class => "button" %></p> </div> <% end %> diff --git a/plugins/users/config/routes.rb b/plugins/users/config/routes.rb deleted file mode 100644 index 54f17eb..0000000 --- a/plugins/users/config/routes.rb +++ /dev/null @@ -1,5 +0,0 @@ -ActionController::Routing::Routes.draw do |map| - #map.resources :users - map.resources :users, :member => { :exportssh => :get } - map.connect "/users/:users_id/exportssh", :controller => 'users', :action => 'sshexport' -end -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org