cherry-pick: Fix possible circular reference for category tree and fo…

…lder tree thelia#2041
gillesbourgeat · Apr 29, 2016 · fc745db · fc745db
1 parent 1eee3e4
commit fc745db
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 2.2.3
 
+- (related to #2041) Fix possible circular reference for category tree and folder tree
 - (related to #2017) Add constraint of unicity in create and update hook form
 - (related to #2012) Checking MySQL version to set sql_mode automatically, this fixed the compatibility with MySQL > 5.6 for modes `STRICT_TRANS_TABLES`, `NO_ENGINE_SUBSTITUTION`
 - (related to #2010) Improve product price edition tab

diff --git a/templates/backOffice/default/category-edit.html b/templates/backOffice/default/category-edit.html
@@ -117,8 +117,12 @@
                                                     {custom_render_form_field field='parent'}
                                                          <select {form_field_attributes field='parent' extra_class="form_control"}>
                                                               <option value="0">{intl l="Top level"}</option>
+                                                              {$excludeCategories = []}
+                                                              {loop name="exclude-categories" type="category" parent=$category_id}
+                                                                {$excludeCategories[] = $ID}
+                                                              {/loop}
                                                               {$myparent=$PARENT}
-                                                              {loop name="cat-parent" type="category-tree" visible="*" category="0"}
+                                                              {loop name="cat-parent" type="category-tree" visible="*" category="0" exclude={','|implode:$excludeCategories}}
                                                                    <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $category_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
                                                               {/loop}
                                                         </select>

diff --git a/templates/backOffice/default/folder-edit.html b/templates/backOffice/default/folder-edit.html
@@ -120,12 +120,14 @@
 
 		                                                <select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
 		                                                      <option value="0">{intl l="Top level"}</option>
-
+                                                              {$excludeFolders = []}
+                                                              {loop name="exclude-folders" type="folder" parent=$folder_id}
+                                                                {$excludeFolders[] = $ID}
+                                                              {/loop}
                                                               {$myparent=$PARENT}
-		                                                      {loop name="fold-parent" type="folder-tree" visible="*" folder="0"}
+		                                                      {loop name="fold-parent" type="folder-tree" visible="*" folder="0" exclude={','|implode:$excludeFolders}}
 		                                                           <option value="{$ID}" style="padding-left: {3 + $LEVEL * 20}px" {if $myparent == $ID}selected="selected"{/if} {if $folder_id == $ID}disabled="disabled"{/if}>{$TITLE}</option>
 		                                                      {/loop}
-
 		                                                </select>
 		                                             </div>
 		                                        {/form_field}