Merge pull request #9500 from MrPetovan/bug/9326-owner-view-blocked

[dbstructure 1373] Replace contact.blocked with user.blocked in owner-view

diff --git a/database.sql b/database.sql
index 5e9104b7a20ff55b2e1b3f4897dfdaf346e9c5de..daf65d7c88251981b6d240ef6bece33e6223eced 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1574,7 +1574,7 @@ CREATE VIEW `owner-view` AS SELECT
        `contact`.`term-date` AS `term-date`,
        `contact`.`last-item` AS `last-item`,
        `contact`.`priority` AS `priority`,
-       `contact`.`blocked` AS `blocked`,
+       `user`.`blocked` AS `blocked`,
        `contact`.`block_reason` AS `block_reason`,
        `contact`.`readonly` AS `readonly`,
        `contact`.`writable` AS `writable`,

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 7df84f81ab75ee5b111bd5a8a9734f376ee399dc..67b302054a3fafe457824e9728a6ae89ec6e3a48 100755 (executable)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -54,7 +54,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1372);
+       define('DB_UPDATE_VERSION', 1373);
 }
 
 return [

diff --git a/static/dbview.config.php b/static/dbview.config.php
index ff8600b3da32ac61da6461cf3df4ca77c95398f3..5c183642623faf7ab6a206c24c16179ca7d0deb3 100755 (executable)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -181,7 +181,7 @@ return [
                        "term-date" => ["contact", "term-date"],
                        "last-item" => ["contact", "last-item"],
                        "priority" => ["contact", "priority"],
-                       "blocked" => ["contact", "blocked"], /// @todo Check if "blocked" from contact or from the users table
+                       "blocked" => ["user", "blocked"],
                        "block_reason" => ["contact", "block_reason"],
                        "readonly" => ["contact", "readonly"],
                        "writable" => ["contact", "writable"],