From 6c0d6a8447ff0c30d5360e5cbbb513d72b3dc4c9 Mon Sep 17 00:00:00 2001
From: Robert Lyon <robertl@catalyst.net.nz>
Date: Wed, 28 Nov 2018 12:43:48 +1300
Subject: [PATCH] Bug 1805517: Allow special profile/dashboard blocks in edit
 for templates

Currently when setting up a dashboard/profile template we can't
add/re-add certain blocks if they have been deleted

behatnotneeded

Change-Id: I2bd95b1fb67357994b2ff43356387b18b0644d97
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
---
 htdocs/blocktype/inbox/lib.php     | 2 +-
 htdocs/blocktype/myfriends/lib.php | 2 +-
 htdocs/blocktype/mygroups/lib.php  | 2 +-
 htdocs/blocktype/myviews/lib.php   | 2 +-
 htdocs/blocktype/wall/lib.php      | 2 +-
 htdocs/blocktype/watchlist/lib.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/blocktype/inbox/lib.php b/htdocs/blocktype/inbox/lib.php
index 0ee1099a23..0cabea9ef2 100644
--- a/htdocs/blocktype/inbox/lib.php
+++ b/htdocs/blocktype/inbox/lib.php
@@ -138,7 +138,7 @@ class PluginBlocktypeInbox extends MaharaCoreBlocktype {
      * Inbox only makes sense for personal views
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('owner') != null;
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     /**
diff --git a/htdocs/blocktype/myfriends/lib.php b/htdocs/blocktype/myfriends/lib.php
index 17addee2fd..c3d4fb8126 100644
--- a/htdocs/blocktype/myfriends/lib.php
+++ b/htdocs/blocktype/myfriends/lib.php
@@ -148,7 +148,7 @@ class PluginBlocktypeMyfriends extends MaharaCoreBlocktype {
      * Myfriends only makes sense for personal views
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('owner') != null;
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     public static function override_instance_title(BlockInstance $instance) {
diff --git a/htdocs/blocktype/mygroups/lib.php b/htdocs/blocktype/mygroups/lib.php
index be58ed9cc6..0d85755dc4 100644
--- a/htdocs/blocktype/mygroups/lib.php
+++ b/htdocs/blocktype/mygroups/lib.php
@@ -155,7 +155,7 @@ class PluginBlocktypeMyGroups extends MaharaCoreBlocktype {
      * Mygroups only makes sense for personal views
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('owner') != null;
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     public static function override_instance_title(BlockInstance $instance) {
diff --git a/htdocs/blocktype/myviews/lib.php b/htdocs/blocktype/myviews/lib.php
index bf3b21bfb4..bef6f54ed7 100644
--- a/htdocs/blocktype/myviews/lib.php
+++ b/htdocs/blocktype/myviews/lib.php
@@ -123,7 +123,7 @@ class PluginBlocktypeMyviews extends MaharaCoreBlocktype {
      * Myviews only makes sense for personal views
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('owner') != null;
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     public static function override_instance_title(BlockInstance $instance) {
diff --git a/htdocs/blocktype/wall/lib.php b/htdocs/blocktype/wall/lib.php
index 7cf1c67c68..307eecfcab 100644
--- a/htdocs/blocktype/wall/lib.php
+++ b/htdocs/blocktype/wall/lib.php
@@ -307,7 +307,7 @@ EOF;
      * Wall only makes sense on profile viewtypes
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('type') == 'profile';
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     public static function override_instance_title(BlockInstance $instance) {
diff --git a/htdocs/blocktype/watchlist/lib.php b/htdocs/blocktype/watchlist/lib.php
index 7026836fd8..6b5956f4b7 100755
--- a/htdocs/blocktype/watchlist/lib.php
+++ b/htdocs/blocktype/watchlist/lib.php
@@ -272,7 +272,7 @@ class PluginBlocktypeWatchlist extends MaharaCoreBlocktype {
      * Watchlist only makes sense for personal views
      */
     public static function allowed_in_view(View $view) {
-        return $view->get('owner') != null;
+        return in_array($view->get('type'), self::get_viewtypes());
     }
 
     public static function should_ajaxify() {
-- 
GitLab