From 2efed69b3b9e77b38dc4bf7a962093959d2a5558 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 4 Nov 2022 09:01:48 +0100 Subject: [PATCH] add workaround note for pending pull request --- src/Application/Controller/Traits/accountTrait.php | 1 + src/Application/views/tpl/d3webauthnaccountlogin.tpl | 1 + src/IntelliSenseHelper.php | 1 + .../Application/Controller/d3_AccountController_Webauthn.php | 1 + .../Controller/d3_AccountDownloadsController_Webauthn.php | 1 + .../Controller/d3_AccountNewsletterController_Webauthn.php | 1 + .../Controller/d3_AccountNoticeListController_Webauthn.php | 1 + .../Controller/d3_AccountOrderController_Webauthn.php | 1 + .../Controller/d3_AccountPasswordController_Webauthn.php | 1 + .../Controller/d3_AccountRecommlistController_Webauthn.php | 1 + .../Controller/d3_AccountReviewController_Webauthn.php | 1 + .../Controller/d3_AccountUserController_Webauthn.php | 1 + .../Controller/d3_AccountWishlistController_Webauthn.php | 1 + src/metadata.php | 2 ++ 14 files changed, 15 insertions(+) diff --git a/src/Application/Controller/Traits/accountTrait.php b/src/Application/Controller/Traits/accountTrait.php index df02a5f..4b35528 100644 --- a/src/Application/Controller/Traits/accountTrait.php +++ b/src/Application/Controller/Traits/accountTrait.php @@ -15,6 +15,7 @@ namespace D3\Webauthn\Application\Controller\Traits; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ trait accountTrait { protected $d3WebauthnLoginTemplate = 'd3webauthnaccountlogin.tpl'; diff --git a/src/Application/views/tpl/d3webauthnaccountlogin.tpl b/src/Application/views/tpl/d3webauthnaccountlogin.tpl index e296d02..5fe3445 100644 --- a/src/Application/views/tpl/d3webauthnaccountlogin.tpl +++ b/src/Application/views/tpl/d3webauthnaccountlogin.tpl @@ -1,3 +1,4 @@ +[{** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) **}] [{include file=$oxLoginTpl}] [{capture name="d3JsFnc"}][{strip}] diff --git a/src/IntelliSenseHelper.php b/src/IntelliSenseHelper.php index b8eb165..8e3cfb8 100755 --- a/src/IntelliSenseHelper.php +++ b/src/IntelliSenseHelper.php @@ -45,6 +45,7 @@ namespace D3\Webauthn\Modules\Application\Controller class d3_webauthn_PaymentController_parent extends PaymentController {} + /** workarounds for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountController_Webauthn_parent extends AccountController {} class d3_AccountDownloadsController_Webauthn_parent extends AccountDownloadsController {} diff --git a/src/Modules/Application/Controller/d3_AccountController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountController_Webauthn.php index d6c3f74..96da8d8 100644 --- a/src/Modules/Application/Controller/d3_AccountController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountController_Webauthn extends d3_AccountController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php index 9b7aa6e..acc78fd 100644 --- a/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountDownloadsController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountDownloadsController_Webauthn extends d3_AccountDownloadsController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php index d3ee0fa..cc8f00c 100644 --- a/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountNewsletterController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountNewsletterController_Webauthn extends d3_AccountNewsletterController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php index 4535e3a..f2ba210 100644 --- a/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountNoticeListController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountNoticeListController_Webauthn extends d3_AccountNoticeListController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php index 536dbc8..15fdae9 100644 --- a/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountOrderController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountOrderController_Webauthn extends d3_AccountOrderController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php index 444b002..b2ceefe 100644 --- a/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountPasswordController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountPasswordController_Webauthn extends d3_AccountPasswordController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php index b80515e..78505a9 100644 --- a/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountRecommlistController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountRecommlistController_Webauthn extends d3_AccountRecommlistController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php index 9f6c5bb..cf81695 100644 --- a/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountReviewController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountReviewController_Webauthn extends d3_AccountReviewController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php index 703212c..c7f9c36 100644 --- a/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountUserController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountUserController_Webauthn extends d3_AccountUserController_Webauthn_parent { use accountTrait; diff --git a/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php b/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php index 3598272..38629c0 100644 --- a/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php +++ b/src/Modules/Application/Controller/d3_AccountWishlistController_Webauthn.php @@ -17,6 +17,7 @@ namespace D3\Webauthn\Modules\Application\Controller; use D3\Webauthn\Application\Controller\Traits\accountTrait; +/** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ class d3_AccountWishlistController_Webauthn extends d3_AccountWishlistController_Webauthn_parent { use accountTrait; diff --git a/src/metadata.php b/src/metadata.php index 7185325..8f13106 100755 --- a/src/metadata.php +++ b/src/metadata.php @@ -88,6 +88,7 @@ $aModule = array( LoginController::class => d3_LoginController_Webauthn::class, UserComponent::class => d3_webauthn_UserComponent::class, + /** workarounds for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ AccountController::class => d3_AccountController_Webauthn::class, AccountDownloadsController::class => d3_AccountDownloadsController_Webauthn::class, AccountNoticeListController::class => d3_AccountNoticeListController_Webauthn::class, @@ -110,6 +111,7 @@ $aModule = array( 'd3webauthnlogin.tpl' => 'd3/oxwebauthn/Application/views/tpl/d3webauthnlogin.tpl', 'd3webauthnadminlogin.tpl' => 'd3/oxwebauthn/Application/views/admin/tpl/d3webauthnlogin.tpl', 'd3_account_webauthn.tpl' => 'd3/oxwebauthn/Application/views/tpl/d3_account_webauthn.tpl', + /** workaround for missing tpl blocks (https://github.com/OXID-eSales/wave-theme/pull/124) */ 'd3webauthnaccountlogin.tpl'=> 'd3/oxwebauthn/Application/views/tpl/d3webauthnaccountlogin.tpl', 'js_create.tpl' => 'd3/oxwebauthn/Application/views/tpl/inc/js_create.tpl',