nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
[dbstructure 1373] Replace contact.blocked with user.blocked in owner-view
This commit is contained in:
Michael Vogel 2020-11-08 08:45:12 +01:00 committed by GitHub
parent ff6ab4caa3 254b5ae07a
commit 55f26218af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database.sql
View file

@ -1574,7 +1574,7 @@ CREATE VIEW `owner-view` AS SELECT
`contact`.`term-date` AS `term-date`, `contact`.`term-date` AS `term-date`,
`contact`.`last-item` AS `last-item`, `contact`.`last-item` AS `last-item`,
`contact`.`priority` AS `priority`, `contact`.`priority` AS `priority`,
`contact`.`blocked` AS `blocked`, `user`.`blocked` AS `blocked`,
`contact`.`block_reason` AS `block_reason`, `contact`.`block_reason` AS `block_reason`,
`contact`.`readonly` AS `readonly`, `contact`.`readonly` AS `readonly`,
`contact`.`writable` AS `writable`, `contact`.`writable` AS `writable`,

2
static/dbstructure.config.php
View file

@ -54,7 +54,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1372); define('DB_UPDATE_VERSION', 1373);
} }
return [ return [

2
static/dbview.config.php
View file

@ -181,7 +181,7 @@ return [
"term-date" => ["contact", "term-date"], "term-date" => ["contact", "term-date"],
"last-item" => ["contact", "last-item"], "last-item" => ["contact", "last-item"],
"priority" => ["contact", "priority"], "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"], "block_reason" => ["contact", "block_reason"],
"readonly" => ["contact", "readonly"], "readonly" => ["contact", "readonly"],
"writable" => ["contact", "writable"], "writable" => ["contact", "writable"],