diff --git a/app/controllers/antennas_controller.rb b/app/controllers/antennas_controller.rb index 5e51e9a68a..ca7ee5d2a2 100644 --- a/app/controllers/antennas_controller.rb +++ b/app/controllers/antennas_controller.rb @@ -12,28 +12,8 @@ class AntennasController < ApplicationController @antennas = current_account.antennas.includes(:antenna_domains).includes(:antenna_tags).includes(:antenna_accounts) end - def new - @antenna = current_account.antennas.build - @antenna.antenna_domains.build - @antenna.antenna_tags.build - @antenna.antenna_accounts.build - end - def edit; end - def create - @antenna = current_account.antennas.build(thin_resource_params) - - saved = @antenna.save - saved = @antenna.update(resource_params) if saved - - if saved - redirect_to antennas_path - else - render action: :new - end - end - def update if @antenna.update(resource_params) redirect_to antennas_path diff --git a/app/views/antennas/index.html.haml b/app/views/antennas/index.html.haml index d0b9bbcc14..27a7933051 100644 --- a/app/views/antennas/index.html.haml +++ b/app/views/antennas/index.html.haml @@ -1,9 +1,6 @@ - content_for :page_title do = t('antennas.index.title') -- content_for :heading_actions do - = link_to t('antennas.new.title'), new_antenna_path, class: 'button' - - if @antennas.empty? .muted-hint.center-text= t 'antennas.index.empty' - else diff --git a/app/views/antennas/new.html.haml b/app/views/antennas/new.html.haml deleted file mode 100644 index 9ff46b253c..0000000000 --- a/app/views/antennas/new.html.haml +++ /dev/null @@ -1,9 +0,0 @@ -- content_for :page_title do - = t('antennas.new.title') - -= simple_form_for @antenna, url: antennas_path do |f| - = render 'shared/error_messages', object: @antenna - = render 'antenna_fields', f: f, lists: @lists - - .actions - = f.button :button, t('antennas.new.save'), type: :submit diff --git a/config/locales/en.yml b/config/locales/en.yml index 18ed3cb8f5..ecb59c9463 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1130,9 +1130,6 @@ en: expires_on: Expires on %{date} stl: This antenna is in STL mode, ignoring reject-subscription settings. title: Antennas - new: - save: Save new antenna - title: Add new antenna appearance: advanced_web_interface: Advanced web interface advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fd93ff54ab..4bd14dfe6e 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1124,9 +1124,6 @@ ja: tags: other: "%{count}件のタグ" title: アンテナ - new: - save: 新規アンテナを保存 - title: 新規アンテナを追加 appearance: advanced_web_interface: 上級者向けUI advanced_web_interface_hint: 'ディスプレイを幅いっぱいまで活用したい場合、上級者向け UI をおすすめします。ホーム、通知、連合タイムライン、更にはリストやハッシュタグなど、様々な異なるカラムから望む限りの情報を一度に受け取れるような設定が可能になります。'