Merge pull request #191 from lunika/186-back-office-impossible-to-delete-related-content

This PR was merged into thelia:master branch.

Discussion
----------

Fix associations with category, product and content

+---------------+------+
| Q             | A    |
| ---           | ---  |
| Bug fix?      | y    |
| New feature?  | n    |
| BC breaks?    | n    |
| Deprecations? | n    |
| Tests pass?   | y    |
| Fixed tickets | #186 |
| License       | GPL  |
| Doc PR        |      |
+---------------+------+


Commits
-------

502b149d32 change good content id for category associated content lunika
87bc1a83aa change content if on product associated content lunika
91cf069313 fix associations tab in product modification page lunika
d573ff54c2 put correct error messages in Document loop lunika
ce0fbb11a1 add missing close block lunika

core/lib/Thelia/Action/BaseCachedFile.php

@@ -159,7 +159,7 @@ abstract class BaseCachedFile extends BaseAction
         // Create directory (recursively) if it does not exists.
         if ($create_if_not_exists && !is_dir($path)) {
             if (!@mkdir($path, 0777, true)) {
-                throw new \RuntimeException(sprintf("Failed to create %s/%s file in cache directory",  $cache_base));
+                throw new \RuntimeException(sprintf("Failed to create %s file in cache directory",  $path));
             }
         }
 

core/lib/Thelia/Core/Template/Loop/Accessory.php

@@ -123,10 +123,11 @@ class Accessory extends Product
         foreach ($results as $loopResultRow) {
 
             $accessoryProductId = $loopResultRow->get('ID');
-
+            \Thelia\Log\Tlog::getInstance()->notice($this->accessoryId);
             $loopResultRow
                 ->set("ID"      , $this->accessoryId[$accessoryProductId])
                 ->set("POSITION", $this->accessoryPosition[$accessoryProductId])
+                ->set("ACCESSORY_ID", $accessoryProductId)
                 ;
         }
 

core/lib/Thelia/Core/Template/Loop/AssociatedContent.php

@@ -166,6 +166,7 @@ class AssociatedContent extends Content
                 ->set("ID"        , $this->contentId[$relatedContentId])
                 ->set("CONTENT_ID", $relatedContentId)
                 ->set("POSITION"  , $this->contentPosition[$relatedContentId])
+
             ;
         }
 

core/lib/Thelia/Core/Template/Loop/Document.php

@@ -267,7 +267,7 @@ class Document extends BaseI18nLoop implements PropelSearchLoopInterface
                 $loopResult->addRow($loopResultRow);
             } catch (\Exception $ex) {
                 // Ignore the result and log an error
-                Tlog::getInstance()->addError("Failed to process document in document loop: ", $this->args);
+                Tlog::getInstance()->addError(sprintf("Failed to process document in document loop: %s", $ex->getMessage()), $this->args);
             }
         }
 

templates/backOffice/default/ajax/product-related-tab.html

@@ -105,7 +105,7 @@
 		                        <td class="actions">
 		                            <div class="btn-group">
 		                                {loop type="auth" name="can_create" role="ADMIN" resources="admin.product" access="UPDATE"}
-		                                   <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
+		                                   <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$CONTENT_ID}" data-toggle="modal">
 		                                    <span class="glyphicon glyphicon-trash"></span>
 		                                   </a>
 		                                {/loop}
@@ -226,7 +226,7 @@
 		                        <td class="actions">
 		                            <div class="btn-group">
 		                                {loop type="auth" name="can_create" role="ADMIN" resources="admin.product" access="UPDATE"}
-		                                   <a class="btn btn-default btn-xs delete-accessory" title="{intl l='Delete this accessory'}" href="#delete_accessory_dialog" data-id="{$ID}" data-toggle="modal">
+		                                   <a class="btn btn-default btn-xs delete-accessory" title="{intl l='Delete this accessory'}" href="#delete_accessory_dialog" data-id="{$ACCESSORY_ID}" data-toggle="modal">
 		                                    <span class="glyphicon glyphicon-trash"></span>
 		                                   </a>
 		                                {/loop}
@@ -523,7 +523,7 @@ $(function() {
 
     $('.accessoryPositionChange').editable({
         type        : 'text',
-        title       : '{intl l="Enter new accessory position"}',
+        title       : "{intl l="Enter new accessory position"}",
         mode        : 'popup',
         inputclass  : 'input-mini',
         placement   : 'left',
@@ -541,7 +541,7 @@ $(function() {
 
     $('.contentPositionChange').editable({
         type        : 'text',
-        title       : '{intl l="Enter new content position"}',
+        title       : "{intl l="Enter new content position"}",
         mode        : 'popup',
         inputclass  : 'input-mini',
         placement   : 'left',

templates/backOffice/default/category-edit.html

@@ -228,7 +228,7 @@
                                                         <td class="actions">
                                                             <div class="btn-group">
                                                                 {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.category" access="UPDATE"}
-                                                                   <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
+                                                                   <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$CONTENT_ID}" data-toggle="modal">
                                                                     <span class="glyphicon glyphicon-trash"></span>
                                                                    </a>
                                                                 {/loop}

templates/backOffice/default/folder-edit.html

@@ -152,7 +152,7 @@
  		</div>
 	</div>
 </div>
-
+{/block}
 {block name="javascript-initialization"}
     {javascripts file='assets/js/dropzone.js'}
         <script src="{$asset_url}"></script>

templates/backOffice/default/product-edit.html

@@ -154,7 +154,9 @@ $(function() {
     $('.nav-tabs a[data-href]').on('shown.bs.tab', function(ev) {
         var $this = $(this);
         $($this.attr('href')).load($this.data('href'), function(ev) {
-            eval($this.data('callback') + '();');
+            if($this.data('callback')) {
+                eval($this.data('callback') + '();');
+            }
         });
     });