updating metadata page

brightcove · Nov 21, 2024 · 053ed14 · 053ed14
1 parent 55fef15
commit 053ed14
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 15 deletions.
diff --git a/current/all/pom.xml b/current/all/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/analyse/pom.xml b/current/analyse/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/core/pom.xml b/current/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>brightcove.core</artifactId>

diff --git a/current/it.tests/pom.xml b/current/it.tests/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/pom.xml b/current/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.coresecure</groupId>
     <artifactId>brightcove</artifactId>
     <packaging>pom</packaging>
-    <version>6.1.9</version>
+    <version>6.1.10-SNAPSHOT</version>
     <description>Brightcove Connector</description>
 
     <modules>

diff --git a/current/ui.apps.structure/pom.xml b/current/ui.apps.structure/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.apps/pom.xml b/current/ui.apps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...pps/src/main/content/jcr_root/apps/brightcove/components/shared/autoDialog/autoDialog.jsp b/...pps/src/main/content/jcr_root/apps/brightcove/components/shared/autoDialog/autoDialog.jsp
@@ -34,17 +34,21 @@
 <%@ page import="org.apache.sling.commons.json.JSONObject" %>
 <%@ page import="com.coresecure.brightcove.wrapper.sling.ServiceUtil" %>
 <%@ page import="org.apache.sling.commons.json.JSONArray" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@ page trimDirectiveWhitespaces="true" %>
 <%@include file="/libs/foundation/global.jsp" %>
 <%
 
 
     Resource asset_res = slingRequest.getParameter("item") != null ? resourceResolver.resolve(slingRequest.getParameter("item")) : resourceResolver.resolve(slingRequest.getRequestPathInfo().getSuffix());
 
-    ValueMap parentProps = asset_res.getParent().getValueMap();
+	Resource metadataRes = asset_res.getChild("jcr:content/metadata");
+	ValueMap map = metadataRes.adaptTo(ValueMap.class);
+	String brcid = map.get("brc_id","");
+   
     Node parentNode = asset_res.getParent().adaptTo(Node.class);
-    
-    if ( parentProps != null && parentNode.hasProperty("brc_folder_id")) {
+
+    if ( StringUtils.isNotBlank("brc_id")) {
 
         String requestedAccount;
         
@@ -55,8 +59,6 @@
             requestedAccount = parentNode.getName();
         }
 
-        Resource metadataRes = asset_res.getChild("jcr:content/metadata");
-        ValueMap map = metadataRes.adaptTo(ValueMap.class);
 
         ServiceUtil serviceUtil = new ServiceUtil(requestedAccount);
 

diff --git a/current/ui.config/pom.xml b/current/ui.config/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.content/pom.xml b/current/ui.content/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/current/ui.tests/pom.xml b/current/ui.tests/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.coresecure</groupId>
         <artifactId>brightcove</artifactId>
-        <version>6.1.9</version>
+        <version>6.1.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>