Removed skype field and added Discord on users. Also dropped unused table
This commit is contained in:
@@ -149,9 +149,9 @@ class UsersController < ApplicationController
|
||||
def update
|
||||
if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
|
||||
if mod?
|
||||
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
|
||||
userdata = user_params([:name, :discord, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark])
|
||||
else
|
||||
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
|
||||
userdata = user_params([:name, :discord, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
|
||||
end
|
||||
if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != @user
|
||||
flash[:alert] = "You have entered a name that belongs to someone else. Please try another."
|
||||
|
||||
@@ -168,7 +168,7 @@ class User < ActiveRecord::Base
|
||||
self.ign.strip! if self.ign
|
||||
self.email.strip! if self.email
|
||||
self.about.strip! if self.about
|
||||
self.skype.strip! if self.skype
|
||||
self.discord.strip! if self.discord
|
||||
self.youtube.strip! if self.youtube
|
||||
self.twitter.strip! if self.twitter
|
||||
end
|
||||
|
||||
@@ -43,9 +43,9 @@
|
||||
</tr>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td>Skype username</td>
|
||||
<td>Discord username</td>
|
||||
<td>
|
||||
<%= f.text_field :skype, placeholder: "Skype username", disabled: !can_edit? %>
|
||||
<%= f.text_field :discord, placeholder: "Discord username", disabled: !can_edit? %>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -54,10 +54,10 @@
|
||||
<td><b>Role</b></td>
|
||||
<td><%= link_to @user.role, users_path(:role => @user.role.name) %></td>
|
||||
</tr>
|
||||
<% if current_user && !@user.skype.blank? %>
|
||||
<% if current_user && !@user.discord.blank? %>
|
||||
<tr>
|
||||
<td><b>Skype</b></td>
|
||||
<td><%= link_to @user.skype, "skype:#{@user.skype}?chat", target: "_blank" %></a></td>
|
||||
<td><b>Discord</b></td>
|
||||
<td><%= @user.discord %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<% if !@user.youtube.blank? && !@user.youtube_channelname.blank? %>
|
||||
|
||||
Reference in New Issue
Block a user