Remove site Entity. Not used anymore.

nikrou · Nov 9, 2021 · 1cb0491 · 1cb0491
1 parent 6d5a06c
commit 1cb0491
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 395 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 ;; data
 /_data
 /upload
-/galleries
 /db/*
 !/db/index.php
 /media/*

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Phyxo 2.3.0 - YYYY-MM-DD
 
-- nothing yet
+- Remove site Entity. Not used anymore.
 
 # Phyxo 2.2.0 - 2021-11-06
 

diff --git a/admin/theme/template/site_manager.html.twig b/admin/theme/template/site_manager.html.twig
diff --git a/install/phyxo_structure-mysql.sql b/install/phyxo_structure-mysql.sql
@@ -22,7 +22,6 @@ CREATE TABLE `phyxo_categories` (
   `dir` VARCHAR(255) DEFAULT NULL,
   `rank` INT DEFAULT NULL,
   `status` VARCHAR(25) NOT NULL DEFAULT 'public',
-  `site_id` INT DEFAULT NULL,
   `visible` TINYINT(1) NOT NULL DEFAULT 1,
   `representative_picture_id` INT DEFAULT NULL,
   `uppercats` VARCHAR(255) NOT NULL DEFAULT '',
@@ -277,16 +276,6 @@ CREATE TABLE `phyxo_sessions` (
   `sess_lifetime` INTEGER UNSIGNED NOT NULL
 ) ENGINE=InnoDB;
 
---
--- Table structure for table `phyxo_sites`
---
-
-DROP TABLE IF EXISTS `phyxo_sites`;
-CREATE TABLE `phyxo_sites` (
-  `id` INT AUTO_INCREMENT NOT NULL,
-  `galleries_url` VARCHAR(255) NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB;
 
 --
 -- Table structure for table `phyxo_tags`

diff --git a/install/phyxo_structure-pgsql.sql b/install/phyxo_structure-pgsql.sql
@@ -25,7 +25,6 @@ CREATE TABLE "phyxo_categories"
   "dir" VARCHAR(255),
   "rank" INTEGER,
   "status" VARCHAR(25) NOT NULL DEFAULT 'public',
-  "site_id" INTEGER DEFAULT 1,
   "visible" BOOLEAN DEFAULT true,
   "representative_picture_id" INTEGER,
   "uppercats" VARCHAR(255) DEFAULT '' NOT NULL,
@@ -253,19 +252,6 @@ CREATE TABLE "phyxo_sessions"
 );
 
 
------------------------------------------------------------------------------
--- phyxo_sites
------------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS "phyxo_sites";
-CREATE TABLE "phyxo_sites"
-(
-  "id" serial  NOT NULL,
-  "galleries_url" VARCHAR(255) DEFAULT '' NOT NULL,
-  PRIMARY KEY ("id")
-);
-
-
 -----------------------------------------------------------------------------
 -- phyxo_tags
 -----------------------------------------------------------------------------

diff --git a/install/phyxo_structure-sqlite.sql b/install/phyxo_structure-sqlite.sql
@@ -25,7 +25,6 @@ CREATE TABLE "phyxo_categories"
   "dir" VARCHAR(255),
   "rank" INTEGER,
   "status" VARCHAR(50) default 'public',
-  "site_id" INTEGER default 1,
   "visible" BOOLEAN default true,
   "representative_picture_id" INTEGER,
   "uppercats" VARCHAR(255) default '' NOT NULL,
@@ -274,20 +273,6 @@ CREATE TABLE "phyxo_sessions"
 );
 
 
------------------------------------------------------------------------------
--- phyxo_sites
------------------------------------------------------------------------------
-
-DROP TABLE IF EXISTS "phyxo_sites";
-CREATE TABLE "phyxo_sites"
-(
-  "id" INTEGER  NOT NULL,
-  "galleries_url" VARCHAR(255) default '' NOT NULL,
-  PRIMARY KEY ("id"),
-  CONSTRAINT "sites_ui1" UNIQUE ("galleries_url")
-);
-
-
 -----------------------------------------------------------------------------
 -- phyxo_tags
 -----------------------------------------------------------------------------

diff --git a/src/Controller/Admin/AdminSiteController.php b/src/Controller/Admin/AdminSiteController.php
diff --git a/src/Entity/Album.php b/src/Entity/Album.php
@@ -108,11 +108,6 @@ class Album
      */
     private $last_modified;
 
-    /**
-     * @ORM\OneToOne(targetEntity=Site::class, cascade={"persist", "remove"})
-     */
-    private $site;
-
     /**
      * @ORM\ManyToMany(targetEntity=Group::class, mappedBy="group_access", cascade={"persist", "remove"})
      */
@@ -303,18 +298,6 @@ public function setLastModified(?\DateTimeInterface $last_modified): self
         return $this;
     }
 
-    public function getSite(): ?Site
-    {
-        return $this->site;
-    }
-
-    public function setSite(?Site $site): self
-    {
-        $this->site = $site;
-
-        return $this;
-    }
-
     public function isVirtual(): bool
     {
         return !$this->dir;