Merge pull request #50 from rockandror/remove-old-settings-tabs-code

Remove old settings tabs code
rockandror · Sep 24, 2019 · 5aae01b · 5aae01b
2 parents cf34ca4 + 9d60838
commit 5aae01b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 19 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -83,7 +83,6 @@
 //= require globalize
 //= require send_admin_notification_alert
 //= require modal_download
-//= require settings
 //= require cookies
 //= require columns_selector
 //= require budget_edit_associations.js.coffee
@@ -136,7 +135,6 @@ var initialize_modules = function() {
   App.Globalize.initialize();
   App.SendAdminNotificationAlert.initialize();
   App.ModalDownload.initialize();
-  App.Settings.initialize();
   App.Cookies.initialize();
   if ( $('#js-columns-selector').length )
     App.ColumnsSelector.initialize();

diff --git a/app/assets/javascripts/settings.js.coffee b/app/assets/javascripts/settings.js.coffee
diff --git a/app/views/admin/dashboard/actions/_default_actions.html.erb b/app/views/admin/dashboard/actions/_default_actions.html.erb
@@ -6,7 +6,7 @@
     <td colspan="4">&nbsp;</td>
     <td class="text-right">
       <%= link_to t("admin.dashboard.actions.index.edit"),
-                        admin_settings_path(anchor: "tab-proposals"),
+                        admin_setting_path("proposals"),
                         class: "button hollow" %>
     </td>
   </tr>

diff --git a/app/views/admin/settings/_settings_form.html.erb b/app/views/admin/settings/_settings_form.html.erb
@@ -1,5 +1,4 @@
 <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
-  <%= f.hidden_field :tab, value: tab if defined?(tab) %>
   <div class="small-12 medium-6 large-8 column">
     <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %>
   </div>

diff --git a/app/views/admin/settings/_settings_table.html.erb b/app/views/admin/settings/_settings_table.html.erb
@@ -19,11 +19,7 @@
           <% if setting.content_type? %>
             <%= render "admin/settings/content_types_settings_form", setting: setting %>
           <% else %>
-            <% if defined?(tab) %>
-              <%= render "admin/settings/settings_form", setting: setting, tab: tab %>
-            <% else %>
-              <%= render "admin/settings/settings_form", setting: setting %>
-            <% end %>
+            <%= render "admin/settings/settings_form", setting: setting %>
           <% end %>
         </td>
       </tr>