view.html.erb in kit_cms-2.3.22

- old
+ new

@@ -13,16 +13,16 @@
   </tr>
   <% end %>
 
   <% if Preference.get_cached(_sid, 'show_groups') %>
   <tr><td valign='top'><%= link_to "Groups", "/admin/groups" %>:</td><td>
-      <%= @user.groups.map {|g| link_to g.name, "/admin/user/#{@user.id}/group/#{g.id}", :method=>"delete" }.join(", ").html_safe %>
+      <%= @user.groups.sys(_sid).map {|g| link_to g.name, "/admin/user/#{@user.id}/group/#{g.id}", :method=>"delete" }.join(", ").html_safe %>
       <%= "<span class='field_help'>click to remove</span>".html_safe if @user.groups.size>0 %>
         <% one_group = false %>
       <div style="display: none;" id="add_to_groups">
         <ul>
-          <% Group.order(:name).all.each do |group| %>
+          <% Group.sys(_sid).order(:name).all.each do |group| %>
           <% next if @user.groups.include?(group)  %>
           <li>
           <% one_group = true %>
           <%= link_to group.name, "/admin/user/#{@user.id}/group/#{group.id}", :method=>:post %> 
           </li>
@@ -42,14 +42,15 @@
     <td><div class="both_space"><%= best_in_place @user, :password, :path=>"/admin/user/#{@user.id}/password" %></div></td>
   </tr>
 
   <tr><td width="200">Sign in count:</td><td><%= @user.sign_in_count %></td></tr>
   <tr><td>Registered:</td><td><%= time_ago_in_words(@user.created_at) %> ago at <%= @user.created_at %></td></tr>
+  <tr><td>Sign Up IP:</td><td><%= ip_info_link @user.sign_up_ip rescue '' %></td></tr>
     <tr><td>Last sign in:</td><td><%= time_ago_in_words(@user.last_sign_in_at) rescue 'never' %> ago at <%= @user.last_sign_in_at rescue 'never' %></tr>
     <tr><td>Current sign in:</td><td><%= time_ago_in_words(@user.current_sign_in_at) rescue 'never' %> ago at <%= @user.current_sign_in_at rescue 'never'%></tr>
-      <tr><td>Current sign in IP:</td><td><%= @user.current_sign_in_ip %></td></tr>
+      <tr><td>Current sign in IP:</td><td><%= ip_info_link @user.current_sign_in_ip %></td></tr>
       <tr><td>Last sign in:</td><td><%= time_ago_in_words(@user.last_sign_in_at) rescue 'never' %></td></tr>
-      <tr><td>Last sign in IP:</td><td><%= @user.last_sign_in_ip rescue 'none' %></td></tr>
+      <tr><td>Last sign in IP:</td><td><%= @user.last_sign_in_up ? ip_info_link(@user.last_sign_in_ip) : '' rescue 'none' %></td></tr>
       <% if feature?("newsletters") %>
       <tr><td>Subscribed Newsletter:</td><td><%= @user.subscribe_newsletter==1 ? 'Yes' : 'No' %>
           <%= link_to "Unsubscribe", "/admin/user/#{@user.id}?newsletter=0", :class=>"action_pl" if @user.subscribe_newsletter==1 %>
           <%= link_to "Subscribe", "/admin/user/#{@user.id}?newsletter=1", :class=>"action_pl" if @user.subscribe_newsletter==0 %>
       </td></tr>