Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/controllers/admin_controller.rb

@@ -461,8 +461,8 @@ class AdminController < ApplicationController
     scope = User.order('last_login_on desc')
     scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
     scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
-    @user = scope
-    @user = paginateHelper @user,30
+    @users = scope
+    @users = paginateHelper @users,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html

app/views/admin/latest_login_users.html.erb

@@ -47,7 +47,7 @@
     </thead>
     <tbody>
         <% @count=@page * 30 %>
-        <% for user in @user do %>
+        <% for user in @users do %>
             <tr>
               <% @count +=1 %>
               <td align="center">

app/views/users/_project_issue_detail.html.erb

@@ -48,7 +48,7 @@
       <p class="proInfoP"><span><%= activity.status.name %></span> <a href="javascript:void(0)" class="pic_edit2 ml5"></a></p>
       <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
                   {:include_blank => false, :selected => @status_id ? @status_id : 0 },
-                  {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit"}
+                  {:onchange=>"remote_function('#issue_query_form_#{activity.id}');",:id=>"status_id",:name=>"status_id",:class=>"w70 undis issueEdit",:style=>"white-space:nowrap; overflow:hidden;"}
           )
       %>
     </li>