casraf/snpr
1
0
Fork 0
mirror of https://github.com/chenasraf/snpr.git synced 2026-05-18 01:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:gedankenstuecke/snpr

Browse Source
This commit is contained in:
Philipp Bayer
2012-05-29 22:20:12 +10:00
parent e9e1646909 1813fb6647
commit ed5426a9dd
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/phenotypes/index.html.erb
View File

@@ -3,8 +3,8 @@
<table class="zebra-striped" id="no_snp_overview">
<thead>
<tr>
<th>#</th>
<th><%= sortable "id", "ID"%></th>
<th>Count</th>
<th><%= sortable "characteristic","Phenotype"%></th>
<th><%= sortable "number_of_users","Number of users"%></th>
<th><%= sortable "created_at", "Created"%>
@@ -13,8 +13,8 @@
<tbody>
<% @phenotypes_paginate.each do |s| %>
<tr>
<td><%= s.id %></td>
<td><%= Phenotype.all.sort! { |a,b| a.id <=> b.id}.index(s) + 1%></td>
<td><%= s.id %></td>
<td><%= link_to(s.characteristic, s) %></td>
<td><%=s.number_of_users%></td>
<td><%=s.created_at%></td>

2
app/views/users/_edit.html.erb
View File

@@ -47,7 +47,6 @@
<h2>Additional phenotypes</h2>
<%= 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"%>
<div class="field">
<script type="text/javascript">
@@ -60,7 +59,6 @@
<%= p.label Phenotype.find_by_id(p.object.phenotype_id).characteristic %><%= p.text_field :variation, :id => "phenotype_"+p.object.phenotype_id.to_s%> <%= p.link_to_remove "Remove"%><br/>
</div>
<% end %>
<%end %>
<%= link_to "Add a new phenotype", :controller => "phenotypes", :action => "new" %>