diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-15 17:07:51 -0400 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-15 17:07:51 -0400 |
| commit | e0ca82324573a4340b4bf29e39fbd6e6fbcfab92 (patch) | |
| tree | 482a4a40fd46b0a6092f70c50522583cecafff38 | |
| parent | b07830fc7a84f683c7e19fc6d09e92222883a66d (diff) | |
Combined Mastodon username and instance fields into one field.mastodon
| -rw-r--r-- | app/controllers/users_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/users/edit.html.erb | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c228857..f00d703 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -137,9 +137,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, :skype_public, :youtube, :twitter, :mastodon, :mastodon_instance, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark]) + userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :mastodon, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark]) else - userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :mastodon, :mastodon_instance, :about, :header_scroll, :utc_time, :dark]) + userdata = user_params([:name, :skype, :skype_public, :youtube, :twitter, :mastodon, :about, :header_scroll, :utc_time, :dark]) end if userdata[:role] role = Role.get(userdata[:role]) @@ -153,10 +153,6 @@ class UsersController < ApplicationController if userdata[:badge] userdata[:badge] = Badge.get(userdata[:badge]) end - unless userdata[:mastodon].blank? - userdata[:mastodon] = "#{userdata[:mastodon].gsub("@", "")}#{("@" + userdata[:mastodon_instance].gsub("@", "")) unless userdata[:mastodon_instance].blank?}" - end - userdata.delete(:mastodon_instance) if @user.youtube != userdata[:youtube] youtube = get_youtube(userdata[:youtube]) userdata[:youtube] = youtube[:channel] diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 24bdba8..97229de 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -56,10 +56,8 @@ </tr> <tr> <td>Mastodon</td> - <td style="display:inline;padding:0px"> - <% mstdn_array = @user.mastodon.split("@") if @user.mastodon %> - <%= f.text_field :mastodon, value: (mstdn_array[0] if mstdn_array), placeholder: "Mastodon username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)), style: "width:49%;float:left;margin-right:2%" %> - <%= f.text_field :mastodon_instance, value: (mstdn_array[1] if mstdn_array), placeholder: "Mastodon instance", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)), style: "width:49%" %> + <td> + <%= f.text_field :mastodon, placeholder: "Mastodon username", disabled: !(@user.is?(current_user) && confirmed? || (mod? && current_user.role >= @user.role)) %> </td> </tr> <tr> |