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

remove harcoded tinymce. Fix #202

Browse Source
This commit is contained in:
Manuel Raynaud
2014-02-07 17:38:07 +01:00
parent e530da685a
commit 1e5926e06c
9 changed files with 7 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Thelia/Action/Coupon.php
View File

@@ -174,9 +174,9 @@ class Coupon extends BaseAction implements EventSubscriberInterface
// Set default condition if none found
/** @var ConditionInterface $noConditionRule */
$noConditionRule = $this->getContainer()->get('thelia.condition.match_for_everyone');
$noConditionRule = $this->noConditionRule;
/** @var ConditionFactory $conditionFactory */
$conditionFactory = $this->getContainer()->get('thelia.condition.factory');
$conditionFactory = $this->conditionFactory;
$couponRuleCollection = new ConditionCollection();
$couponRuleCollection[] = $noConditionRule;
$defaultSerializedRule = $conditionFactory->serializeConditionCollection(
@@ -215,7 +215,7 @@ class Coupon extends BaseAction implements EventSubscriberInterface
$coupon->setDispatcher($event->getDispatcher());
/** @var ConditionFactory $conditionFactory */
$conditionFactory = $this->getContainer()->get('thelia.condition.factory');
$conditionFactory = $this->conditionFactory;
$coupon->createOrUpdateConditions(
$conditionFactory->serializeConditionCollection($event->getConditions()),