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

Merge pull request #512 from openSNP/CheckJS

Browse Source 
Circumvents issue with endless refreshing on #messages tab
This commit is contained in:
Philipp Bayer
2018-10-16 17:45:31 +08:00
committed by GitHub
parent a96b015fcf ca6645c13e
commit 3cbfc12188
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/application.js
View File

@@ -46,7 +46,6 @@ $(document).ready(function() {
$('#help_three').hide('slow');
};
});
// Jump to tab if link like rs7412080#plos is opened
$(function(){
var hash = window.location.hash;
@@ -54,6 +53,6 @@ $(document).ready(function() {
if (anchor.length > 0){
anchor.click();
}
});
});
});

2
app/views/layouts/_navbar.html.erb
View File

@@ -43,7 +43,7 @@
<li><%= link_to("Settings", "/users/"+current_user.id.to_s+"/edit", class: "navbar-menu__options", :id => current_user) %></li>
<li><%= link_to("Edit Your Phenotypes", "/users/"+current_user.id.to_s+"/edit#phenotypes", class: "navbar-menu__options")%></li>
<li class="divider"></li>
<li><%= link_to("Messages ("+current_user.messages.where(:user_has_seen => false).length.to_s+")","/users/" + current_user.id.to_s + "#messages", :method => "get", class: "navbar-menu__options")%></li>
<li><%= link_to "Messages (#{current_user.messages.where(:user_has_seen => false).length})", user_path(current_user, anchor: 'messages'), class: 'navbar-menu__options' %></li>
<li class="divider"></li>
<li><%= link_to("Sign out", '/signout', class: "navbar-menu__options") %></li>
</ul>