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

fix minor bug

Browse Source
This commit is contained in:
Manuel Raynaud
2014-05-09 10:55:50 +02:00
parent d9d350ea24
commit 85d80d1d77
31 changed files with 243 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Thelia/Controller/Admin/CouponController.php
View File

@@ -33,9 +33,7 @@ use Thelia\Form\Exception\FormValidationException;
use Thelia\Log\Tlog;
use Thelia\Model\Coupon;
use Thelia\Model\CouponQuery;
use Thelia\Model\Lang;
use Thelia\Model\LangQuery;
use Thelia\Tools\I18n;
use Thelia\Tools\Rest\ResponseRest;
/**
@@ -263,8 +261,7 @@ class CouponController extends BaseAdminController
$html = $condition->drawBackOfficeInputs();
$serviceId = $condition->getServiceId();
}
else {
} else {
$html = '';
$serviceId = '';
}

1
core/lib/Thelia/Controller/Admin/ProductController.php
View File

@@ -38,6 +38,7 @@ use Thelia\Core\Event\ProductSaleElement\ProductSaleElementCreateEvent;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Security\AccessManager;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\AccessoryQuery;
use Thelia\Model\CategoryQuery;
use Thelia\Model\FeatureQuery;

1
core/lib/Thelia/Controller/Admin/ProfileController.php
View File

@@ -16,6 +16,7 @@ use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Event\Profile\ProfileEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Form\ProfileCreationForm;
use Thelia\Form\ProfileModificationForm;
use Thelia\Form\ProfileUpdateModuleAccessForm;

2
core/lib/Thelia/Controller/Admin/SessionController.php
View File

@@ -113,7 +113,7 @@ class SessionController extends BaseAdminController
/**
* we have tou find a way to send cookie
*/
if (intval($adminLoginForm->getForm()->get('remember_me')->getData()) > 0) {
if (intval($form->get('remember_me')->getData()) > 0) {
// If a remember me field if present and set in the form, create
// the cookie thant store "remember me" information
$this->createAdminRememberMeCookie($user);

1
core/lib/Thelia/Controller/Admin/TaxRuleController.php
View File

@@ -16,6 +16,7 @@ use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Event\Tax\TaxRuleEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Core\Security\AccessManager;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Form\TaxRuleCreationForm;
use Thelia\Form\TaxRuleModificationForm;
use Thelia\Form\TaxRuleTaxListUpdateForm;