Skip to content

Commit 5fdd525

Browse files
committed
Merge branch 'develop' of github.com:magento-gl/adobe-stock-integration into GL_261022021
2 parents 570a4ec + a96b959 commit 5fdd525

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

AdobeStockImage/Test/Mftf/Test/StorefrontAdobeStockIntegrationApiSwaggerActionsExistTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1051731/scenarios/4297030"/>
1616
<description value="Adobe stock actions are available on the Swagger page"/>
1717
<severity value="CRITICAL"/>
18+
<group value="developer_mode_only"/>
1819
</annotations>
1920
<before>
2021
<getOTP stepKey="getOtpCode"/>

AdobeStockImageAdminUi/view/adminhtml/web/js/components/grid/column/preview/actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ define([
319319
if (this.isMediaBrowser()) {
320320
activeNode = this.getMageMediaBrowserData().activeNode;
321321

322-
activeNodePath = _.isUndefined(activeNode.path) ? '' : activeNode.path;
322+
activeNodePath = _.isUndefined(activeNode.original.path) ? '' : activeNode.original.path;
323323
} else {
324324
activeNodePath = this.imageDirectory().activeNode() || '';
325325
}

AdobeStockImageAdminUi/view/adminhtml/web/js/media-gallery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ define([
109109
folderPath = folderPath + '/' + folderPathParts[i];
110110
}
111111
pathId = Base64.idEncode(folderPath);
112-
openFolderButton = $('.jstree li[data-id="' + pathId + '"]').children('.jstree-icon');
112+
openFolderButton = $('.jstree li[data-id="' + pathId + '"].jstree-closed').children('.jstree-icon');
113113

114114
if (openFolderButton.length) {
115115
openFolderButton.click();

0 commit comments

Comments
 (0)