管理员用户列表增加单位信息

app/controllers/admin_controller.rb

@@ -108,9 +108,9 @@ class AdminController < ApplicationController
 
     case params[:format]
       when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 15})
+        @offset, @limit = api_offset_and_limit({:limit => 50})
       else
-        @limit = 15#per_page_option
+        @limit = 50 #per_page_option
     end
 
     @status = params[:status] || 1

app/views/admin/users.html.erb

@@ -40,7 +40,10 @@
           <%= 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 style="width: 100px;"></th>
+          <%#= sort_header_tag('user_occupation', :caption => l(:field_occupation), :default_order => 'desc') %>
+          <th style="width: 100px;">用户单位</th>
+          <th style="width: 40px;"></th>
+          <th style="width: 40px;"></th>
         </tr>
         </thead>
         <tbody>
@@ -53,8 +56,11 @@
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center"><%= checked_image user.admin? %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="created_on" align="center" title='<%=format_time(user.created_on)%>'><%= format_time(user.created_on) %></td>
               <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="last_login_on" align="center" title='<%= format_time(user.last_login_on)%>'><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-              <td  class="buttons"> <%= change_status_link(user) %>
-                <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %> </td>
+              <% occupation = user.user_extensions.identity == 0 ? School.where("id=?",user.user_extensions.school_id).first.try(:name) : user.user_extensions.occupation  %>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" align="center" align="center" title="<%= occupation %>"> <%= truncate( occupation, :length => 12 ) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="buttons" align="center" title='<%=user.id %>'> <%= change_status_link(user) %></td>
+              <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="buttons" align="center" title='<%=user.id %>'> <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %></td>
+
             </tr>
         <% end -%>
         </tbody>