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

removed skype_public column from users #34

Merged
bruncbrunc merged 2 commits from skype into master 2017-10-12 18:06:42 -04:00
Conversation 3 Commits 2 Files Changed 4 +9 -9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/users_controller.rb
View File

@@ -137,9 +137,9 @@ class UsersController < ApplicationController
def update def update
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?) if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
if mod? if mod?
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark]) userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
else else
userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark]) userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
end end
if userdata[:role] if userdata[:role]
role = Role.get(userdata[:role]) role = Role.get(userdata[:role])

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

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

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

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

6
db/migrate/20170708011014_remove_skype_visibility_from_users.rb Normal file
View File

@@ -0,0 +1,6 @@
class RemoveSkypeVisibilityFromUsers < ActiveRecord::Migration
def change
remove_column :users, :skype_public
User.update_all skype: nil
end
end