From 46957cc52b9dda45917d19a68c42fdc745ec5cae Mon Sep 17 00:00:00 2001 From: Andrew Embler Date: Mon, 6 May 2024 09:37:48 -0700 Subject: [PATCH 1/6] Cherry-picking marketplace updates from 8.5 --- .../desktop_featured_addon/controller.php | 10 ------- .../blocks/desktop_featured_addon/view.php | 13 ++++----- .../desktop_featured_theme/controller.php | 11 +------- .../blocks/desktop_featured_theme/view.php | 27 ++++++------------- .../dashboard/marketplace_connect_failed.php | 8 +++--- .../dashboard/marketplace_upgrade.php | 10 +++++++ .../single_pages/dashboard/extend/connect.php | 14 ++++++++-- 7 files changed, 40 insertions(+), 53 deletions(-) create mode 100644 concrete/elements/dashboard/marketplace_upgrade.php diff --git a/concrete/blocks/desktop_featured_addon/controller.php b/concrete/blocks/desktop_featured_addon/controller.php index 9c933a16ae..37b53b0db7 100644 --- a/concrete/blocks/desktop_featured_addon/controller.php +++ b/concrete/blocks/desktop_featured_addon/controller.php @@ -68,15 +68,5 @@ public function getBlockTypeName() */ public function view() { - $mri = new MarketplaceRemoteItemList(); - $mri->sortBy('recommended'); - $mri->setItemsPerPage(1); - $mri->filterByCompatibility(1); - $mri->setType('addons'); - $mri->execute(); - $items = $mri->getPage(); - if (isset($items[0]) && is_object($items[0])) { - $this->set('remoteItem', $items[0]); - } } } diff --git a/concrete/blocks/desktop_featured_addon/view.php b/concrete/blocks/desktop_featured_addon/view.php index 53d509f5af..cc18297e75 100644 --- a/concrete/blocks/desktop_featured_addon/view.php +++ b/concrete/blocks/desktop_featured_addon/view.php @@ -1,17 +1,14 @@ - - - \ No newline at end of file diff --git a/concrete/blocks/desktop_featured_theme/controller.php b/concrete/blocks/desktop_featured_theme/controller.php index 37195ffacd..658eab4a4f 100644 --- a/concrete/blocks/desktop_featured_theme/controller.php +++ b/concrete/blocks/desktop_featured_theme/controller.php @@ -68,15 +68,6 @@ public function getBlockTypeName() */ public function view() { - $mri = new MarketplaceRemoteItemList(); - $mri->sortBy('recommended'); - $mri->filterByCompatibility(1); - $mri->setItemsPerPage(1); - $mri->setType('themes'); - $mri->execute(); - $items = $mri->getPage(); - if (isset($items[0]) && is_object($items[0])) { - $this->set('remoteItem', $items[0]); - } + } } diff --git a/concrete/blocks/desktop_featured_theme/view.php b/concrete/blocks/desktop_featured_theme/view.php index ecc289da4e..54723ecc11 100644 --- a/concrete/blocks/desktop_featured_theme/view.php +++ b/concrete/blocks/desktop_featured_theme/view.php @@ -1,24 +1,13 @@ - - diff --git a/concrete/elements/dashboard/marketplace_connect_failed.php b/concrete/elements/dashboard/marketplace_connect_failed.php index 7fbc992fe9..70c50007df 100644 --- a/concrete/elements/dashboard/marketplace_connect_failed.php +++ b/concrete/elements/dashboard/marketplace_connect_failed.php @@ -1,6 +1,7 @@ hasConnectionError() && $mi->getConnectionError() == Marketplace::E_MARKETPLACE_SUPPORT_MANUALLY_DISABLED) { ?> @@ -12,7 +13,7 @@ ?> hasConnectionError()) { + if ($mi->hasConnectionError() && $mi->getConnectionError() !== Marketplace::E_GENERAL_CONNECTION_ERROR) { ?>
@@ -39,11 +40,10 @@ ?> + button(t('Troubleshoot Connection'), View::url('/dashboard/extend/connect'), '', 'btn-primary')?> - - button(t('Troubleshoot Connection'), View::url('/dashboard/extend/connect'), '', 'btn-primary')?> + \ No newline at end of file diff --git a/concrete/elements/dashboard/marketplace_upgrade.php b/concrete/elements/dashboard/marketplace_upgrade.php new file mode 100644 index 0000000000..30d5a5d94f --- /dev/null +++ b/concrete/elements/dashboard/marketplace_upgrade.php @@ -0,0 +1,10 @@ + + +
+ +

+ +
+ diff --git a/concrete/single_pages/dashboard/extend/connect.php b/concrete/single_pages/dashboard/extend/connect.php index 513b90da85..916de1d5b6 100644 --- a/concrete/single_pages/dashboard/extend/connect.php +++ b/concrete/single_pages/dashboard/extend/connect.php @@ -14,7 +14,7 @@ hasConnectionError()) { ?> + if ($marketplace->hasConnectionError() && $marketplace->getConnectionError() !== Marketplace::E_GENERAL_CONNECTION_ERROR) { ?>

@@ -89,7 +89,9 @@ + } + + if ($marketplace->getConnectionError() !== Marketplace::E_GENERAL_CONNECTION_ERROR) { ?>
@@ -120,6 +122,14 @@ + + From e838a29ef5127bfd77dcf96728365fd144e2b1cb Mon Sep 17 00:00:00 2001 From: Andrew Embler Date: Mon, 6 May 2024 10:15:34 -0700 Subject: [PATCH 2/6] Upates --- concrete/blocks/desktop_featured_addon/view.php | 3 ++- concrete/blocks/desktop_featured_theme/view.php | 4 ++-- concrete/elements/dashboard/marketplace_upgrade.php | 9 +++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/concrete/blocks/desktop_featured_addon/view.php b/concrete/blocks/desktop_featured_addon/view.php index cc18297e75..05c5365668 100644 --- a/concrete/blocks/desktop_featured_addon/view.php +++ b/concrete/blocks/desktop_featured_addon/view.php @@ -1,10 +1,11 @@