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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml
This commit is contained in:
franck
2013-09-06 17:48:12 +02:00
parent c68f282fe8 0adbb9a997
commit d11906eca5
4 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -143,16 +143,19 @@
<default key="_controller">Thelia\Controller\Admin\CurrencyController::deleteAction</default>
</route>
<route id="admin.configuration.attribute" path="/admin/configuration/product_attributes">
<default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
<route id="admin.configuration.currencies.update-position" path="/admin/configuration/currencies/update-position">
<default key="_controller">Thelia\Controller\Admin\CurrencyController::updatePositionAction</default>
</route>
<!-- attribute and feature routes management -->
<route id="admin.configuration.product-attributes" path="/admin/configuration/product-attributes">
<default key="_controller">Thelia\Controller\Admin\CurrencyController::updatePositionAction</default>
<route id="admin.configuration.attribute" path="/admin/configuration/product_attributes">
<default key="_controller">Thelia\Controller\Admin\AttributeController::defaultAction</default>
</route>
<route id="admin.configuration.attribute.edit" path="/admin/configuration/product_attributes/update">
<default key="_controller">Thelia\Controller\Admin\AttributeController::updateAction</default>
</route>
<!-- end attribute and feature routes management -->

8
core/lib/Thelia/Controller/Admin/AttributeController.php
View File

@@ -43,7 +43,7 @@ use Thelia\Form\MessageCreationForm;
class AttributeController extends BaseAdminController
{
/**
* The default action is displaying the messages list.
* The default action is displaying the attributes list.
*
* @return Symfony\Component\HttpFoundation\Response the response
*/
@@ -54,4 +54,10 @@ class AttributeController extends BaseAdminController
return $this->render('product-attributes');
}
public function updateAction() {
if (null !== $response = $this->checkAuth("admin.configuration.attributes.update")) return $response;
return $this->render('product-attributes-edit');
}
}

11
templates/admin/default/admin-layout.tpl
View File

@@ -163,6 +163,17 @@
{/loop}
</ul>
{loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
<form class="navbar-form pull-right" action="{url path='/admin/search'}">
<div class="form-group">
<div class="form-group">
<input type="text" class="form-control" id="search_term" name="search_term" placeholder="{intl l='Search'}">
</div>
<button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
</div>
</form>
{/loop}
</div>
</div>

1
templates/admin/default/product-attributes-edit.html Normal file
View File

@@ -0,0 +1 @@
test