From 92ec35e6570bffea85ba2669146b7c4fd63f109d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 Oct 2009 18:48:19 +0000
Subject: Unified UsersController#list and #index.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2991 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb |  7 +-----
 app/views/users/index.rhtml         | 47 +++++++++++++++++++++++++++++++++++++
 app/views/users/list.rhtml          | 47 -------------------------------------
 3 files changed, 48 insertions(+), 53 deletions(-)
 create mode 100644 app/views/users/index.rhtml
 delete mode 100644 app/views/users/list.rhtml

(limited to 'app')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 71ceb758f..05dc5bc59 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -24,11 +24,6 @@ class UsersController < ApplicationController
   include CustomFieldsHelper   
 
   def index
-    list
-    render :action => 'list' unless request.xhr?
-  end
-
-  def list
     sort_init 'login', 'asc'
     sort_update %w(login firstname lastname mail admin created_on last_login_on)
     
@@ -49,7 +44,7 @@ class UsersController < ApplicationController
 						:limit  =>  @user_pages.items_per_page,
 						:offset =>  @user_pages.current.offset
 
-    render :action => "list", :layout => false if request.xhr?	
+    render :layout => !request.xhr?	
   end
   
   def show
diff --git a/app/views/users/index.rhtml b/app/views/users/index.rhtml
new file mode 100644
index 000000000..758f1767a
--- /dev/null
+++ b/app/views/users/index.rhtml
@@ -0,0 +1,47 @@
+<div class="contextual">
+<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_user_plural)%></h2>
+
+<% form_tag({}, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label><%= l(:field_status) %>:</label>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<label><%= l(:label_user) %>:</label>
+<%= text_field_tag 'name', params[:name], :size => 30 %>
+<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+</fieldset>
+<% end %>
+&nbsp;
+
+<table class="list">		
+  <thead><tr>
+	<%= sort_header_tag('login', :caption => l(:field_login)) %>
+	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
+	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
+	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
+	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
+    <th></th>
+  </tr></thead>
+  <tbody>
+<% for user in @users -%>
+  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
+	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), :action => 'edit', :id => user %></td>
+	<td class="firstname"><%= h(user.firstname) %></td>
+	<td class="lastname"><%= h(user.lastname) %></td>
+	<td class="email"><%= mail_to(h(user.mail)) %></td>
+	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
+	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
+	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+    <td><small><%= change_status_link(user) %></small></td>
+  </tr>
+<% end -%>
+  </tbody>
+</table>
+
+<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
+
+<% html_title(l(:label_user_plural)) -%>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
deleted file mode 100644
index 758f1767a..000000000
--- a/app/views/users/list.rhtml
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_user_plural)%></h2>
-
-<% form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<label><%= l(:field_status) %>:</label>
-<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-<label><%= l(:label_user) %>:</label>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-</fieldset>
-<% end %>
-&nbsp;
-
-<table class="list">		
-  <thead><tr>
-	<%= sort_header_tag('login', :caption => l(:field_login)) %>
-	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
-	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
-	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
-	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
-	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-    <th></th>
-  </tr></thead>
-  <tbody>
-<% for user in @users -%>
-  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), :action => 'edit', :id => user %></td>
-	<td class="firstname"><%= h(user.firstname) %></td>
-	<td class="lastname"><%= h(user.lastname) %></td>
-	<td class="email"><%= mail_to(h(user.mail)) %></td>
-	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
-	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-    <td><small><%= change_status_link(user) %></small></td>
-  </tr>
-<% end -%>
-  </tbody>
-</table>
-
-<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
-
-<% html_title(l(:label_user_plural)) -%>
-- 
cgit v1.2.3