ns_settings_ui 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b7249ab4cc796c9d58b2ea4e44d8fb1b390d7766d2b5bfd7d6645c0eb4639a
-  data.tar.gz: 8f07761e568cb3b8bb2a8d9aa645ed9702c52bc8ba8ede4910f3ffa356aea735
+  metadata.gz: def0eda93467645d2ae26f90946570733724636d514671634f0cb5d501ee6adb
+  data.tar.gz: 4fdd67d552b4e26777432af353e543f3ecd7fc04b300bb1d00602cd85653118e
 SHA512:
-  metadata.gz: 53e89f206ce9178bddbc49e166a06b9222c2253b16b0564bc1d3fa82488d993bbdf23584010975b1672ce7c56ad803594bf46bc8903e0b99eb84b5fbaebf0ffc
-  data.tar.gz: 5cbc67eaf437014ddd1e9df53b8fed5368c88bbb06f3e330791a4c89ee1a2cc397aa7244ff52e4a7c1840a4bb2392754a7f52e6c7181185999e164171014ffc1
+  metadata.gz: de0094fefc6946fa3384af40f80956d73652ec3d7cb1140424ca80ddd5f14d2376cd5156183be645711732c0f7f562bb812c8a278442be8b2651a75225b56c9a
+  data.tar.gz: d078810ec119d6beb487b9c765f5bc02cae1e22493708ee3e87cba15d88ec7dd8677dde2a4f79396cd2fbc90c9a498f307c90ba5128e1830ff9fbe2aea2da337

data/app/assets/stylesheets/ns_settings_ui/settings.css.scss

@@ -9,13 +9,9 @@
   form {
     display: inline;
   }
-  input[type=text] {
+  input[type=text], select {
     width: 130px;
-    display: inline;
-  }
-  table {
-    td {
-      padding: 2px;
-    }
+    display: inline-block;
+    flex: none;
   }
 }

data/app/controllers/ns_settings_ui/settings_controller.rb

@@ -8,9 +8,7 @@ module NsSettingsUi
     end
 
     def update
-      @setting.value = params[:setting][:value]
-      @setting.default_value = params[:setting][:default_value]
-      @setting.save!
+      @setting.update!(setting_params)
       render partial: 'update'
     end
 
@@ -25,5 +23,9 @@ module NsSettingsUi
     def setting_from_id_param
       @setting = Setting.find(params[:id])
     end
+
+    def setting_params
+      params.require(:setting).permit(:value, :default_value)
+    end
   end
 end

data/app/helpers/ns_settings_ui/settings_helper.rb

@@ -18,9 +18,9 @@ module NsSettingsUi
 
     def render_field(form, value_type, name, additional_class = '')
       if [NsSettingsUi::Setting::TYPES[:boolean], NsSettingsUi::Setting::TYPES[:nullable_boolean]].include?(value_type)
-        form.select(name, [[:true, 'true'], [:false, 'false']], include_blank: true)
+        form.select(name, [[:true, 'true'], [:false, 'false']], {include_blank: true}, {class: "form-select form-select-sm"})
       else
-        form.text_field(name, size: 10, class: "form-control #{additional_class}")
+        form.text_field(name, size: 10, class: "form-control form-control-sm #{additional_class}")
       end
     end
 

data/app/views/ns_settings_ui/settings/_setting_row.html.erb

@@ -1,6 +1,18 @@
-<tr>
-  <td class="setting_key"><h5><%= setting.key -%></h5></td>
-  <td>
-    <%= render partial: 'edit', locals: {setting: setting} -%>
+<tr id="setting_<%= setting.id -%>">
+  <td class="setting_key align-middle"><%= setting.key -%></td>
+  <td class="text-center">
+    <%= form_for(setting, url: ns_settings_ui.setting_path(setting), method: :put, remote: true, html: {class: 'form-inline'}) do |f| %>
+      <%= render_default_value_field(f, setting) %>
+      <%= f.submit('Update', class: 'btn btn-sm btn-primary') %>
+    <% end %>
+  </td>
+  <td class="text-center">
+    <%= form_for(setting, url: ns_settings_ui.setting_path(setting), method: :put, remote: true, html: {class: 'form-inline'}) do |f| %>
+      <%= render_value_field(f, setting) %>
+      <%= f.submit('Update', class: 'btn btn-sm btn-primary') %>
+    <% end %>
+    <%= form_for(setting, url: ns_settings_ui.reset_setting_path(setting), method: :put, remote: true) do |f| %>
+      <%= f.submit('Reset', class: 'btn btn-sm btn-warning', title: 'Reset to default') %>
+    <% end %>
   </td>
 </tr>

data/app/views/ns_settings_ui/settings/_update.js.erb

@@ -1,3 +1,2 @@
-$("#ns_settings_ui #setting_<%= @setting.id -%>").replaceWith("<%= escape_javascript(render partial: 'edit', locals: {setting: @setting}) %>");
-$("#ns_settings_ui #setting_<%= @setting.id -%>").append('<span class="notice text-success">Updated</span>');
-$("#ns_settings_ui #setting_<%= @setting.id -%> .notice").delay(1000).fadeOut('slow');
+$("#ns_settings_ui #setting_<%= @setting.id -%>").replaceWith("<%= escape_javascript(render partial: 'setting_row', locals: {setting: @setting}) %>");
+$("#ns_settings_ui #setting_<%= @setting.id -%>").effect("highlight", {color: '#70ca63'}, 3000);

data/app/views/ns_settings_ui/settings/index.html.erb

@@ -3,14 +3,23 @@
     <%= javascript_include_tag 'ns_settings_ui/application' -%>
 <% end %>
 <div id="ns_settings_ui">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <span>Filter: </span>
-      <input class="form-control" id="filter-input" type="text" value=""> (regular expressions are available)
-    </div>
-    <div class="panel-body">
-      <table class="table table-striped table-bordered">
-        <%= render partial: 'setting_row', collection: @settings, as: 'setting' -%>
+  <h1 class="text-white ps-1">Settings</h1>
+  <div class="card">
+    <div class="card-body">
+      <div class="input-group input-group-sm mb-2">
+        <span class="input-group-text">Filter: </span>
+        <input class="form-control form-control-sm" id="filter-input" type="text" value="">
+        <span class="form-text ms-2">(regular expressions are available)</span>
+      </div>
+      <table class="table table-sm table-striped">
+        <thead>
+          <th>Setting key</th>
+          <th class="text-center">Default value</th>
+          <th class="text-center">Current value</th>
+        </thead>
+        <tbody>
+          <%= render partial: 'setting_row', collection: @settings, as: 'setting' -%>
+        </tbody>
       </table>
     </div>
   </div>

data/db/migrate/20151210214903_create_ns_settings_ui_settings.rb

@@ -1,4 +1,4 @@
-class CreateNsSettingsUiSettings < ActiveRecord::Migration
+class CreateNsSettingsUiSettings < ActiveRecord::Migration[4.2]
   def up
     create_table :ns_settings_ui_settings do |t|
       t.string :key, null: false

data/db/migrate/20151215081718_add_value_type_to_ns_settings_ui_settings.rb

@@ -1,4 +1,4 @@
-class AddValueTypeToNsSettingsUiSettings < ActiveRecord::Migration
+class AddValueTypeToNsSettingsUiSettings < ActiveRecord::Migration[4.2]
   def change
     add_column :ns_settings_ui_settings, :value_type, :integer, default: 0
   end

data/lib/ns_settings_ui/version.rb

@@ -1,3 +1,3 @@
 module NsSettingsUi
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.6.0'.freeze
 end

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -9,17 +8,18 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151215081718) do
-  create_table 'ns_settings_ui_settings', force: true do |t|
-    t.string 'key', null: false
-    t.string 'value'
-    t.string 'default_value'
-    t.datetime 'created_at',                   null: false
-    t.datetime 'updated_at',                   null: false
-    t.integer 'value_type', default: 0
+ActiveRecord::Schema.define(version: 2015_12_15_081718) do
+
+  create_table "ns_settings_ui_settings", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "value"
+    t.string "default_value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer "value_type", default: 0
+    t.index ["key"], name: "index_ns_settings_ui_settings_on_key"
   end
 
-  add_index 'ns_settings_ui_settings', ['key'], name: 'index_ns_settings_ui_settings_on_key'
 end