From 859c72447ef0700a78a11c9905a5a6a2122b6eee Mon Sep 17 00:00:00 2001 From: gregbalonzo Date: Mon, 22 Jun 2020 20:32:52 +0800 Subject: [PATCH 1/8] test message --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6992171da47c..c7da2a969730 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,5 @@ To connect with Magento team and the Community, join us on the [Magento Communit If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link. Adobe Stock Integration project slack channel: [#adobe-stock](https://magentocommeng.slack.com/messages/CJLSYEPFA) + +test \ No newline at end of file From 43cf731f3bf4a5b4258e8acbd4bf2424a99bc890 Mon Sep 17 00:00:00 2001 From: gregbalonzo Date: Tue, 23 Jun 2020 10:43:48 +0800 Subject: [PATCH 2/8] magento/adobe-stock-integration#1499: Display image description in the View Details slide panel - add or retrieve image description from DB and display to View details page of image --- .../view/adminhtml/web/template/image/image-details.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index 80880657a1f1..1948a20519b1 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -27,6 +27,10 @@

+
+

+
+

From a0e68c568bfabc8fff14412b648cdda3c5be6f25 Mon Sep 17 00:00:00 2001 From: gregbalonzo Date: Tue, 23 Jun 2020 11:41:17 +0800 Subject: [PATCH 3/8] magento/adobe-stock-integration#1499: Display image description in the View Details slide panel - add or retrieve image description from DB and display to View details page of image --- MediaGalleryUi/Model/GetDetailsByAssetId.php | 1 + .../view/adminhtml/web/template/image/image-details.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MediaGalleryUi/Model/GetDetailsByAssetId.php b/MediaGalleryUi/Model/GetDetailsByAssetId.php index 7beb1d8c11e5..4993347e3538 100644 --- a/MediaGalleryUi/Model/GetDetailsByAssetId.php +++ b/MediaGalleryUi/Model/GetDetailsByAssetId.php @@ -85,6 +85,7 @@ public function execute(int $assetId): array 'image_url' => $this->getUrl($asset->getPath()), 'title' => $asset->getTitle(), 'path' => $asset->getPath(), + 'description' => $asset->getDescription(), 'id' => $assetId, 'details' => $this->detailsProviderPool->execute($asset), 'size' => $asset->getSize(), diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index 1948a20519b1..d051eb492cf3 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -27,9 +27,9 @@

-
+

-
+

From bee68a8a00ed5d52a99b48ca6bde6f6613f46c41 Mon Sep 17 00:00:00 2001 From: gregbalonzo Date: Tue, 23 Jun 2020 11:43:03 +0800 Subject: [PATCH 4/8] magento/adobe-stock-integration#1499: Display image description in the View Details slide panel - add or retrieve image description from DB and display to View details page of image --- .../view/adminhtml/web/template/image/image-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index d051eb492cf3..5630fa905423 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -27,7 +27,7 @@

-
+

From 3ccbcd333284055897edb2609b06409dd755730a Mon Sep 17 00:00:00 2001 From: gregbalonzo Date: Wed, 24 Jun 2020 13:33:20 +0800 Subject: [PATCH 5/8] magento/adobe-stock-integration#1499: Display image description in the View Details slide panel - add condition if the description is NULL then the description label will not appear --- .../view/adminhtml/web/template/image/image-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index 5630fa905423..6b4fec14bde6 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -27,7 +27,7 @@

-
+

From 35593cbee9944cedf0eb76ded2723f5634bc4442 Mon Sep 17 00:00:00 2001 From: Gabriel da Gama Date: Thu, 25 Jun 2020 09:49:48 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index c7da2a969730..6992171da47c 100644 --- a/README.md +++ b/README.md @@ -21,5 +21,3 @@ To connect with Magento team and the Community, join us on the [Magento Communit If you are interested in joining Slack, or a specific channel, use our [self signup](https://opensource.magento.com/slack) link. Adobe Stock Integration project slack channel: [#adobe-stock](https://magentocommeng.slack.com/messages/CJLSYEPFA) - -test \ No newline at end of file From cb062909ba30b5696b11b1af604f1c660a17acbf Mon Sep 17 00:00:00 2001 From: Gabriel da Gama Date: Thu, 25 Jun 2020 09:50:58 +0100 Subject: [PATCH 7/8] Update MediaGalleryUi/view/adminhtml/web/template/image/image-details.html --- .../view/adminhtml/web/template/image/image-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index 6b4fec14bde6..3ac18433aced 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -29,7 +29,7 @@

-
+

From 99177df4f64a8ccb804d08dec9b39cd6996ea01d Mon Sep 17 00:00:00 2001 From: Gabriel da Gama Date: Thu, 25 Jun 2020 10:15:36 +0100 Subject: [PATCH 8/8] Update MediaGalleryUi/view/adminhtml/web/template/image/image-details.html --- .../view/adminhtml/web/template/image/image-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html index 3ac18433aced..96f1daceed27 100644 --- a/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html +++ b/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html @@ -29,7 +29,7 @@

-
+