Fix: resolve rebase conflicts in NoteHeadScripts script feature flags

Meeds-io · Nov 27, 2024 · 449e613 · 449e613
1 parent d3d64bc
commit 449e613
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml
@@ -22,14 +22,16 @@
                xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd http://www.exoplatform.org/xml/ns/kernel_1_3.xsd"
                xmlns="http://www.exoplatform.org/xml/ns/kernel_1_3.xsd">
     <component>
-        <key>NotesEditorInsertImageOptionFeatureProperties</key>
+        <key>NoteFeatureProperties</key>
         <type>org.exoplatform.container.ExtendedPropertyConfigurator</type>
         <init-params>
             <properties-param>
-                <name>NotesEditorInsertImageOptionFeatureProperties</name>
-                <description>Insert image Feature enablement flag</description>
+                <name>NoteFeatureProperties</name>
+                <description>Note Feature enablement flag</description>
                 <property name="exo.feature.insertImage.enabled"
                           value="${exo.feature.insertImage.enabled:false}"/>
+                <property name="exo.feature.notePublication.enabled"
+                          value="${exo.feature.notePublication.enabled:false}"/>
             </properties-param>
         </init-params>
     </component>

diff --git a/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl b/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl
@@ -6,10 +6,6 @@
 %>
 
 <script type="text/javascript" id="NoteHeadScripts">
-<<<<<<< HEAD
     eXo.env.portal.notePublicationEnabled = <%=featureService.isFeatureActiveForUser("notePublication", userName)%>;
-</script>
-=======
     eXo.env.portal.insertImageOptionEnabled = <%=featureService.isFeatureActiveForUser("insertImage", userName)%>;
 </script>
->>>>>>> e95f4435b (feat: Implement Notes/Content insert image option - EXO-74754 - Meeds-io/MIPs#145 (#1211))