From 8818aa680c2ddaf1204e297fe27f088499eea74f Mon Sep 17 00:00:00 2001
From: Miquel Sabaté Solà <msabate@suse.com>
Date: Thu, 14 Mar 2024 22:17:12 +0100
Subject: Dropped redundant 'location' column
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Looks like I messed up later on and kept two columns which were
basically referring to the same thing.

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
---
 app/controllers/things_controller.rb | 4 ++--
 app/models/thing.rb                  | 1 -
 app/views/things/_form.html.erb      | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'app')

diff --git a/app/controllers/things_controller.rb b/app/controllers/things_controller.rb
index 450b409..e994a3d 100644
--- a/app/controllers/things_controller.rb
+++ b/app/controllers/things_controller.rb
@@ -63,7 +63,7 @@ class ThingsController < ApplicationController
 
   def thing_params
     params.require(:thing).permit(:target, :title, :publisher, :address, :year, :url, :access,
-                                  :authors, :location, :insideof, :pages, :rate, :status, :kind,
-                                  :bought_at, :editors, :note, :where_is_it, tag_ids: [])
+                                  :authors, :insideof, :pages, :rate, :status, :kind, :bought_at,
+                                  :editors, :note, :where_is_it, tag_ids: [])
   end
 end
diff --git a/app/models/thing.rb b/app/models/thing.rb
index 5c758fb..1f1e4e4 100644
--- a/app/models/thing.rb
+++ b/app/models/thing.rb
@@ -23,7 +23,6 @@ class Thing < ApplicationRecord
          .or(where('publisher LIKE ?', "%#{text}%"))
          .or(where('address LIKE ?', "%#{text}%"))
          .or(where('url LIKE ?', "%#{text}%"))
-         .or(where('location LIKE ?', "%#{text}%"))
          .or(where('insideof LIKE ?', "%#{text}%"))
          .or(where('pages LIKE ?', "%#{text}%"))
          .or(where('note LIKE ?', "%#{text}%"))
diff --git a/app/views/things/_form.html.erb b/app/views/things/_form.html.erb
index da90302..0569cc4 100644
--- a/app/views/things/_form.html.erb
+++ b/app/views/things/_form.html.erb
@@ -49,11 +49,6 @@
       <%= form.date_field :access %>
     </div>
 
-    <div>
-      <%= form.label :location %>
-      <%= form.text_field :location %>
-    </div>
-
     <div>
       <%= form.label :insideof %>
       <%= form.text_field :insideof %>
-- 
cgit v1.2.3