Changes to the species show page in connection with redmine issue #22…

…11 and changes to the user controller and display of user link in menu in connection with redmine issue #2186.

app/controllers/users_controller.rb

@@ -8,11 +8,14 @@ def index
     @iteration = params[:iteration][/\d+/] rescue 1
     if current_user.page_access_level == 1
       @users = User.sorted_order("#{sort_column('users', 'created_at')} DESC").search(params[:search]).paginate(
-        :page => params[:page], 
+        :page => params[:page],
         :per_page => params[:DataTables_Table_0_length]
       )
     else
-      @users = User.find(current_user.id)
+      @users = User.where("id = #{current_user.id}").paginate(
+        :page => params[:page],
+        :per_page => params[:DataTables_Table_0_length]
+      )
     end
 
     respond_to do |format|
@@ -21,7 +24,7 @@ def index
     end
   end
 
-  def show 
+  def show
     if current_user.page_access_level == 1
       user_id = params[:id]
     else
@@ -33,15 +36,15 @@ def show
   def new
     @user = User.new
   end
- 
+
   def create
     logout_keeping_session!
     @user = User.new(params[:user])
     @user.access_level = 3
     @user.page_access_level = 4
     if Rails.env == "test"
       success = @user && @user.save
-    else 
+    else
       success = verify_recaptcha(:model => @user, :message => "Please re-enter the words from the image again.") && @user && @user.save
     end
     page_access_level = ["", "Administrator", "Manager", "Creator", "Viewer"]

app/views/layouts/application.html.erb

@@ -135,9 +135,7 @@
                 <li><%= link_to "Species", species_index_path %></li>
                 <li><%= link_to "Traits", traits_path %></li>
                 <li><%= link_to "Treatments", treatments_path %></li>
-                <% if current_user != nil && current_user.page_access_level <= 1 %>
                 <li><%= link_to "Users", users_path %></li>
-                <% end %>
                 <li><%= link_to "Variables", variables_path %></li>
                 <li><%= link_to "Yields", yields_path %></li>
               </ul>

app/views/species/show.html.erb

@@ -10,15 +10,15 @@
 <dl class = "dl-horizontal">
     <dt>Plant:</dt>
     <dd><%= @specie.AcceptedSymbol %></dd>
-    <dt>Spcd:</dt>
+    <dt>USDA Species Symbol:</dt>
     <dd><%= @specie.spcd %></dd>
     <dt>Genus:</dt>
     <dd><%= @specie.genus %></dd>
     <dt>Species:</dt>
     <dd><%= @specie.species %></dd>
-    <dt>Scientificname:</dt>
+    <dt>Scientific Name:</dt>
     <dd><%= @specie.scientificname %></dd>
-    <dt>Commonname:</dt>
+    <dt>Common Name:</dt>
     <dd><%= @specie.commonname %></dd>
 
   </dl>