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

Merge branch 'master' of github.com:thelia/thelia into cleanmaster

Browse Source
This commit is contained in:
Etienne Roudeix
2013-12-09 10:29:49 +01:00
parent 14e7181d06 9885c67ade
commit cc4fce9add
9 changed files with 737 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/lib/Thelia/Core/Event/TheliaEvents.php
View File

@@ -107,7 +107,7 @@ final class TheliaEvents
/**
* sent just before customer removal
*/
const BEFORE_DELETECUSTOMER = "action.before_updateCustomer";
const BEFORE_DELETECUSTOMER = "action.before_deleteCustomer";
/**
* sent just after customer removal
@@ -121,7 +121,7 @@ final class TheliaEvents
const ADDRESS_CREATE = "action.createAddress";
/**
* sent for address creation
* sent for address modification
*/
const ADDRESS_UPDATE = "action.updateAddress";
@@ -135,7 +135,14 @@ final class TheliaEvents
*/
const ADDRESS_DEFAULT = "action.defaultAddress";
/**
* sent once the address creation form has been successfully validated, and before address insertion in the database.
*/
const BEFORE_CREATEADDRESS = "action.before_createAddress";
/**
* Sent just after a successful insert of a new address in the database.
*/
const AFTER_CREATEADDRESS = "action.after_createAddress";
const BEFORE_UPDATEADDRESS = "action.before_updateAddress";

7
core/lib/Thelia/Model/Category.php
View File

@@ -115,12 +115,7 @@ class Category extends BaseCategory
*/
public function postDelete(ConnectionInterface $con = null)
{
RewritingUrlQuery::create()
->filterByView($this->getRewrittenUrlViewName())
->filterByViewId($this->getId())
->update(array(
"View" => ConfigQuery::getObsoleteRewrittenUrlView()
));
$this->markRewritenUrlObsolete();
$this->dispatchEvent(TheliaEvents::AFTER_DELETECATEGORY, new CategoryEvent($this));
}

7
core/lib/Thelia/Model/Content.php
View File

@@ -148,12 +148,7 @@ class Content extends BaseContent
public function postDelete(ConnectionInterface $con = null)
{
RewritingUrlQuery::create()
->filterByView($this->getRewrittenUrlViewName())
->filterByViewId($this->getId())
->update(array(
"View" => ConfigQuery::getObsoleteRewrittenUrlView()
));
$this->markRewritenUrlObsolete();
$this->dispatchEvent(TheliaEvents::AFTER_DELETECONTENT, new ContentEvent($this));
}

7
core/lib/Thelia/Model/Folder.php
View File

@@ -100,12 +100,7 @@ class Folder extends BaseFolder
public function postDelete(ConnectionInterface $con = null)
{
RewritingUrlQuery::create()
->filterByView($this->getRewrittenUrlViewName())
->filterByViewId($this->getId())
->update(array(
"View" => ConfigQuery::getObsoleteRewrittenUrlView()
));
$this->markRewritenUrlObsolete();
$this->dispatchEvent(TheliaEvents::AFTER_DELETEFOLDER, new FolderEvent($this));
}

7
core/lib/Thelia/Model/Product.php
View File

@@ -263,12 +263,7 @@ class Product extends BaseProduct
*/
public function postDelete(ConnectionInterface $con = null)
{
RewritingUrlQuery::create()
->filterByView($this->getRewrittenUrlViewName())
->filterByViewId($this->getId())
->update(array(
"View" => ConfigQuery::getObsoleteRewrittenUrlView()
));
$this->markRewritenUrlObsolete();
$this->dispatchEvent(TheliaEvents::AFTER_DELETEPRODUCT, new ProductEvent($this));
}

13
core/lib/Thelia/Model/Tools/UrlRewritingTrait.php
View File

@@ -31,6 +31,7 @@ use Thelia\Model\RewritingUrlQuery;
use Thelia\Model\RewritingUrl;
use Thelia\Rewriting\RewritingResolver;
use Thelia\Tools\URL;
use Thelia\Model\ConfigQuery;
/**
* A trait for managing Rewritten URLs from model classes
*/
@@ -138,6 +139,18 @@ trait UrlRewritingTrait {
return $url;
}
/**
* Mark the current URL as obseolete
*/
public function markRewritenUrlObsolete() {
RewritingUrlQuery::create()
->filterByView($this->getRewrittenUrlViewName())
->filterByViewId($this->getId())
->update(array(
"View" => ConfigQuery::getObsoleteRewrittenUrlView()
));
}
/**
* Set the rewritten URL for the given locale
*

1028
templates/backOffice/default/I18n/fr_FR.php
View File

File diff suppressed because it is too large Load Diff

25
templates/backOffice/default/assets/less/thelia/thelia.less
View File

@@ -161,16 +161,6 @@
width: 100%;
}
.btn-group {
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
> .btn {
float: inherit;
}
> .btn + .btn {
margin-left: -4px;
}
}
// -- Login form --------------------------------------------------------------
.form-signin {
@@ -424,3 +414,18 @@
border: 1px dashed #ddd;
padding: 20px;
}
// No button wrap in button groups in td.action cells
table {
td.actions {
.btn-group {
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
> .btn {
float: inherit;
}
> .btn + .btn {
margin-left: -4px;
}
}
}
}

8
templates/frontOffice/default/product.html
View File

@@ -197,18 +197,20 @@
{strip}
{capture "additional"}
{ifloop rel="feature_info"}
{ifloop rel="feature_value_info"}
<ul>
{loop name="feature_info" type="feature" product="{$ID}"}
{ifloop rel="feature_value_info"}
<li>
<strong>{$TITLE}</strong> :
{loop name="feature_value_info" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
{$TITLE}
{/loop}
</li>
{/ifloop}
{/loop}
</ul>
{/ifloop}
{/ifloop}
{/capture}
{/strip}
@@ -221,7 +223,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane active in" id="description" itemprop="description" role="tabpanel" aria-labelledby="tab1">
<p>{$DESCRIPTION|default:'N/A'}</p>
<p>{$DESCRIPTION|default:'N/A' nofilter}</p>
</div>
{if $smarty.capture.additional ne ""}
<div class="tab-pane" id="additional" role="tabpanel" aria-labelledby="tab2">