Merge branch 'develop'

melisplatform · Nov 8, 2018 · f77d008 · f77d008
2 parents 4535cce + f541031
commit f77d008
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 11 deletions.
diff --git a/public/plugins/js/plugin.melistagHTML.init.js b/public/plugins/js/plugin.melistagHTML.init.js
@@ -38,7 +38,7 @@ $("body").on("blur", "div.html-editable", function(){
 		tagValue : content,
     };
     melisPluginEdition.calcFrameHeight();
-    melisPluginEdition.savePluginUpdate(data);
+    melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
 melistagHTML_init();
diff --git a/public/plugins/js/plugin.melistagMEDIA.init.js b/public/plugins/js/plugin.melistagMEDIA.init.js
@@ -38,7 +38,7 @@ $("body").on("blur", "div.media-editable", function(){
 		tagValue : content,
     };
     melisPluginEdition.calcFrameHeight();
-    melisPluginEdition.savePluginUpdate(data);
+    melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
 

diff --git a/public/plugins/js/plugin.melistagTEXTAREA.init.js b/public/plugins/js/plugin.melistagTEXTAREA.init.js
@@ -38,7 +38,7 @@ $("body").on("blur", "div.textarea-editable", function(){
 		tagValue : content,
     };
     melisPluginEdition.calcFrameHeight();
-    melisPluginEdition.savePluginUpdate(data);
+    melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
 melistagTEXTAREA_init();
diff --git a/src/Controller/MelisPluginRendererController.php b/src/Controller/MelisPluginRendererController.php
@@ -25,7 +25,6 @@ public function getPluginAction()
         $pluginId = $this->getRequest()->getQuery('pluginId', $this->params()->fromRoute('pluginId', null));
         $fromDragDropZone = $this->getRequest()->getQuery('fromDragDropZone', $this->params()->fromRoute('fromDragDropZone', false));
         $encapsulatedPlugin = $this->getRequest()->getQuery('encapsulatedPlugin', true);
-
         $post = $this->getRequest()->getPost()->toArray();
         $pluginHardcodedConfig = array();
         if (!empty($post['pluginHardcodedConfig']))

diff --git a/src/Controller/Plugin/MelisFrontDragDropZonePlugin.php b/src/Controller/Plugin/MelisFrontDragDropZonePlugin.php
@@ -154,6 +154,23 @@ public function back()
         $viewModel->pluginName = $this->pluginName;
         $viewModel->pluginXmlDbKey = $this->pluginXmlDbKey;
 
+        $pageId = (!empty($this->pluginFrontConfig['pageId'])) ? $this->pluginFrontConfig['pageId'] : 0;
+
+        $siteModule = getenv('MELIS_MODULE');
+        $melisPage = $this->getServiceLocator()->get('MelisEnginePage');
+        $datasPage = $melisPage->getDatasPage($pageId, 'saved');
+        if($datasPage)
+        {
+            $datasTemplate = $datasPage->getMelisTemplate();
+
+            if(!empty($datasTemplate))
+            {
+                $siteModule = $datasTemplate->tpl_zf2_website_folder;
+            }
+        }
+
+        $viewModel->siteModule = $siteModule;
+
         return $viewModel;
     }
 

diff --git a/src/Listener/MelisFrontLayoutListener.php b/src/Listener/MelisFrontLayoutListener.php
@@ -102,6 +102,7 @@ function(MvcEvent $e){
                             $siteModule = getenv('MELIS_MODULE');
                             $melisPage = $sm->get('MelisEnginePage');
                             $datasPage = $melisPage->getDatasPage($idpage, 'saved');
+
                             if($datasPage)
                             {
                                 $datasTemplate = $datasPage->getMelisTemplate();
@@ -114,7 +115,6 @@ function(MvcEvent $e){
 
                             // Setting special layout
                             $finalView->setTemplate('layout/layoutMelis');
-
                             $forwardPlugin = $sm->get('ControllerPluginManager')->get('Forward');
 
                             // Including the plugins menu by getting the view

diff --git a/view/melis-front/plugins/dragdropzone-melis-container.phtml b/view/melis-front/plugins/dragdropzone-melis-container.phtml
@@ -6,9 +6,14 @@
         $pluginId = $this->pluginFrontConfig['id'];
 
 ?>
-<div class='melis-dragdropzone no-content' <?= $data_dragdropzone_id; ?> data-module="<?= $this->configPluginKey; ?>"
-		data-plugin="<?= $this->pluginName; ?>" data-plugin-id="<?= $pluginId; ?>" data-melis-tag="<?= $this->pluginXmlDbKey; ?>">
-<?php 
+<div class='melis-dragdropzone no-content'
+    <?= $data_dragdropzone_id; ?>
+     data-module="<?= $this->configPluginKey; ?>"
+     data-plugin="<?= $this->pluginName; ?>"
+     data-plugin-id="<?= $pluginId; ?>"
+     data-melis-tag="<?= $this->pluginXmlDbKey; ?>"
+     data-site-module="<?= $this->siteModule; ?>">
+<?php
     echo $this->viewFront;
 ?>
 </div>
diff --git a/view/melis-front/plugins/tag-melis-container.phtml b/view/melis-front/plugins/tag-melis-container.phtml
@@ -31,8 +31,13 @@
 	<div class="melis-plugin-indicator">
 		<i class="fa fa-plug"></i>
 	</div>
-	<div class="melis-plugin-tools-box" data-module="<?= $this->configPluginKey; ?>"
-		data-plugin="<?= $this->pluginName; ?>" data-plugin-id="<?= $pluginId; ?>" data-site-module="<?= $this->siteModule; ?>" data-melis-tag="<?= $this->pluginXmlDbKey; ?>" data-melis-fromDragDropZone="<?= $this->fromDragDropZone; ?>"
+	<div class="melis-plugin-tools-box"
+         data-module="<?= $this->configPluginKey; ?>"
+		 data-plugin="<?= $this->pluginName; ?>"
+         data-plugin-id="<?= $pluginId; ?>"
+         data-site-module="<?= $this->siteModule; ?>"
+         data-melis-tag="<?= $this->pluginXmlDbKey; ?>"
+         data-melis-fromDragDropZone="<?= $this->fromDragDropZone; ?>"
          data-plugin-width-desktop="<?= ($this->fromDragDropZone) ? $this->widthDesktop : null; ?>"
          data-plugin-width-tablet="<?= ($this->fromDragDropZone) ? $this->widthTablet : null; ?>"
          data-plugin-width-mobile="<?= ($this->fromDragDropZone) ? $this->widthMobile : null; ?>"
@@ -67,7 +72,7 @@
 
 ?>
     <div class='<?= $this->type; ?>-editable melis-editable' <?= $data_tag_type; ?> <?= $data_tag_id; ?> <?= $data_id_page; ?> <?= $tag_id; ?> data-plugin-hardcode="true" data-module="<?= $this->configPluginKey; ?>"
-		data-plugin="<?= $this->pluginName; ?>" data-plugin-id="<?= $pluginId; ?>"  data-melis-tag="<?= $this->pluginXmlDbKey; ?>">
+		data-plugin="<?= $this->pluginName; ?>" data-plugin-id="<?= $pluginId; ?>"  data-melis-tag="<?= $this->pluginXmlDbKey; ?>" data-site-module="<?= $this->siteModule; ?>">
     <?php 
         echo $this->viewFront;
     ?>