Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

Merge pull request #34.

Browse Source
This commit is contained in:
Logan Fick
2017-10-12 18:04:31 -04:00
parent 908e67482c a323613b9a
commit fd40ac82ff
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/users/edit.html.erb
View File

@@ -48,12 +48,6 @@
<%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
</td>
</tr>
<tr>
<td>Show Skype to</td>
<td>
<%= f.select :skype_public, [["Staff only", false], ["All users", true]], {}, { disabled: !can_edit? } %>
</td>
</tr>
<tr>
<td>YouTube Channel ID</td>
<td>

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

@@ -52,7 +52,7 @@
<td><b>Role</b></td>
<td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
</tr>
<% if current_user && !@user.skype.blank? && (@user.skype_public || current_user == @user || mod?) %>
<% if current_user && !@user.skype.blank? %>
<tr>
<td><b>Skype</b></td>
<td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>