diff --git a/app/views/phenotypes/index.html.erb b/app/views/phenotypes/index.html.erb index e770e85..83d24ef 100644 --- a/app/views/phenotypes/index.html.erb +++ b/app/views/phenotypes/index.html.erb @@ -3,8 +3,8 @@ + - <% @phenotypes_paginate.each do |s| %> - + diff --git a/app/views/users/_edit.html.erb b/app/views/users/_edit.html.erb index a88703d..35a9896 100644 --- a/app/views/users/_edit.html.erb +++ b/app/views/users/_edit.html.erb @@ -47,7 +47,6 @@

Additional phenotypes

<%= f.fields_for :user_phenotypes do |p| %> <% @phenotype = Phenotype.find_by_id(p.object.phenotype_id) %> - <% if @phenotype and @phenotype.characteristic != "Hair colour" and @phenotype.characteristic!= "Height" and @phenotype.characteristic != "Skin colour" and @phenotype.characteristic != "Population group"%>
# <%= sortable "id", "ID"%>Count <%= sortable "characteristic","Phenotype"%> <%= sortable "number_of_users","Number of users"%> <%= sortable "created_at", "Created"%> @@ -13,8 +13,8 @@
<%= s.id %> <%= Phenotype.all.sort! { |a,b| a.id <=> b.id}.index(s) + 1%><%= s.id %> <%= link_to(s.characteristic, s) %> <%=s.number_of_users%> <%=s.created_at%>