TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change folder_id parm by parent in list folder view

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-21 13:55:12 +02:00
parent 962081c17d
commit bb796f08b6
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Controller/Admin/FolderController.php
View File

@@ -235,7 +235,7 @@ class FolderController extends AbstractCrudController
array(
'folder_order' => $currentOrder,
'content_order' => $product_order,
'folder_id' => $this->getRequest()->get('folder_id', 0)
'parent' => $this->getRequest()->get('parent', 0)
));
}
@@ -267,7 +267,7 @@ class FolderController extends AbstractCrudController
// Redirect to parent category list
$this->redirectToRoute(
'admin.folders.default',
array('folder_id' => $updateEvent->getFolder()->getParent())
array('parent' => $updateEvent->getFolder()->getParent())
);
}
}
@@ -283,7 +283,7 @@ class FolderController extends AbstractCrudController
// Redirect to parent category list
$this->redirectToRoute(
'admin.folders.default',
array('folder_id' => $deleteEvent->getFolder()->getParent())
array('parent' => $deleteEvent->getFolder()->getParent())
);
}
@@ -300,7 +300,7 @@ class FolderController extends AbstractCrudController
// Redirect to parent category list
$this->redirectToRoute(
'admin.folders.default',
array('folder_id' => $folder->getParent())
array('parent' => $folder->getParent())
);
}
@@ -322,7 +322,7 @@ class FolderController extends AbstractCrudController
{
$this->redirectToRoute(
'admin.folders.default',
array('folder_id' => $this->getRequest()->get('folder_id', 0))
array('parent' => $this->getRequest()->get('parent', 0))
);
}
}

32
templates/admin/default/folders.html
View File

@@ -20,7 +20,7 @@
<table class="table table-striped table-condensed" id="folder_list">
<caption>
{* display parent folder name, and get current folder ID *}
{loop name="folder_title" type="folder" visible="*" id=$folder_id}
{loop name="folder_title" type="folder" visible="*" id=$parent}
{intl l="Folders in %fold" fold=$TITLE}
{$fold_id = $ID}
{/loop}
@@ -29,7 +29,7 @@
{/elseloop}
<td class="object-title">
<a href="{url path='admin/folders' folder_id=$ID}" title="{intl l='Browse this folder'}">
<a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
{$TITLE}
</a>
</td>
@@ -50,7 +50,7 @@
current_order=$folder_order
order='id'
reverse_order='id_reverse'
path={url path='/admin/folders' folder_id=$folder_id}
path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order'
label="{intl l='ID'}"
}
@@ -63,7 +63,7 @@
current_order=$folder_order
order='alpha'
reverse_order='alpha_reverse'
path={url path='/admin/folders' folder_id=$folder_id}
path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order'
label="{intl l='Folder title'}"
}
@@ -76,7 +76,7 @@
current_order=$folder_order
order='visible'
reverse_order='visible_reverse'
path={url path='/admin/folders' folder_id=$folder_id}
path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order'
label="{intl l='Online'}"
}
@@ -87,7 +87,7 @@
current_order=$folder_order
order='manual'
reverse_order='manual_reverse'
path={url path='/admin/folders' folder_id=$folder_id}
path={url path='/admin/folders' parent=$parent}
request_parameter_name='folder_order'
label="{intl l='Position'}"
}
@@ -98,18 +98,18 @@
</thead>
<tbody>
{loop name="folder_list" type="folder" visible="*" parent=$folder_id order=$folder_order backend_context="1" lang=$lang_id}
{loop name="folder_list" type="folder" visible="*" parent=$parent order=$folder_order backend_context="1" lang=$lang_id}
<tr>
<td>{$ID}</td>
<td>
{loop type="image" name="folder_image" source="folder" source_id="$ID" limit="1" width="50" height="50" resize_mode="crop" backend_context="1"}
<a href="{url path='admin/folders' folder_id=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
<a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}"><img class="img-thumbnail" src="{$IMAGE_URL}" alt="{$TITLE}" /></a>
{/loop}
</td>
<td class="object-title">
<a href="{url path='admin/folders' folder_id=$ID}" title="{intl l='Browse this folder'}">
<a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
{$TITLE}
</a>
</td>
@@ -143,7 +143,7 @@
<td class="actions">
<div class="btn-group">
<a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' folder_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
<a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' parent=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
<a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path="/admin/folders/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
@@ -191,7 +191,7 @@
<table class="table table-striped table-condensed">
<caption>
{* display parent folder name *}
{loop name="folder_title" type="folder" visible="*" id=$folder_id}
{loop name="folder_title" type="folder" visible="*" id=$parent}
{intl l="Contents in %fold" fold=$TITLE}
{/loop}
@@ -256,7 +256,7 @@
</thead>
<tbody>
{loop name="content_list" type="content" visible="*" folder_default=$folder_id order=$content_order}
{loop name="content_list" type="content" visible="*" folder_default=$parent order=$content_order}
<tr>
<td>{$ID}</td>
@@ -348,7 +348,7 @@
{/form_field}
{form_field form=$form field='parent'}
<input type="hidden" name="{$name}" value="{$folder_id}" />
<input type="hidden" name="{$name}" value="{$parent}" />
{/form_field}
{form_field form=$form field='title'}
@@ -412,7 +412,7 @@
{form_hidden_fields form=$form}
{* Be sure to get the folder_id, even if the form could not be validated *}
<input type="hidden" name="folder_id" value="{$folder_id}" />
<input type="hidden" name="folder_id" value="{$parent}" />
{form_field form=$form field='success_url'}
{* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller *}
@@ -420,7 +420,7 @@
{/form_field}
{form_field form=$form field='default_folder'}
<input type="hidden" name="{$name}" value="{$folder_id}" />
<input type="hidden" name="{$name}" value="{$parent}" />
{/form_field}
{form_field form=$form field='title'}
@@ -498,7 +498,7 @@
{capture "content_delete_dialog"}
<input type="hidden" name="content_id" id="content_delete_id" value="" />
<input type="hidden" name="folder_id" value="{$folder_id}" />
<input type="hidden" name="folder_id" value="{$parent}" />
{module_include location='content_delete_form'}