diff options
author | Futseh <jonas.folvik@gmail.com> | 2019-02-22 16:44:25 +0100 |
---|---|---|
committer | Futseh <jonas.folvik@gmail.com> | 2019-02-22 16:44:25 +0100 |
commit | b3a347392331727d551d69a29175a50fe98e96a3 (patch) | |
tree | 0288ae36f9afe097ecedfa2f746e86f14b82d196 /app | |
parent | 7bae0042a0da27abc9ca57180a414f58bad7830d (diff) |
Removed skype field and added Discord on users. Also dropped unused table
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/users_controller.rb | 4 | ||||
-rw-r--r-- | app/models/user.rb | 2 | ||||
-rw-r--r-- | app/views/users/edit.html.erb | 4 | ||||
-rw-r--r-- | app/views/users/show.html.erb | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 28bdf7b..61613af 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -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." diff --git a/app/models/user.rb b/app/models/user.rb index 4f682c6..6100f44 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 3516cc9..cfbf229 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -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> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index cafe726..ae33c1a 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -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? %> |