change behavior for default currency delection. Fix #275
This commit is contained in:
@@ -98,18 +98,14 @@ class Currency extends BaseAction implements EventSubscriberInterface
|
|||||||
{
|
{
|
||||||
|
|
||||||
if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) {
|
if (null !== $currency = CurrencyQuery::create()->findPk($event->getCurrencyId())) {
|
||||||
|
// Reset default status
|
||||||
|
CurrencyQuery::create()->filterByByDefault(true)->update(array('ByDefault' => false));
|
||||||
|
|
||||||
if ($currency->getByDefault() != $event->getIsDefault()) {
|
$currency
|
||||||
|
->setDispatcher($event->getDispatcher())
|
||||||
// Reset default status
|
->setByDefault($event->getIsDefault())
|
||||||
CurrencyQuery::create()->filterByByDefault(true)->update(array('ByDefault' => false));
|
->save()
|
||||||
|
;
|
||||||
$currency
|
|
||||||
->setDispatcher($event->getDispatcher())
|
|
||||||
->setByDefault($event->getIsDefault())
|
|
||||||
->save()
|
|
||||||
;
|
|
||||||
}
|
|
||||||
|
|
||||||
$event->setCurrency($currency);
|
$event->setCurrency($currency);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -441,4 +441,15 @@ ul.document-list {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Loader (Overlay)
|
||||||
|
.loader {
|
||||||
|
position: fixed;
|
||||||
|
background: #fff url(../img/ajax-loader.gif) no-repeat center center;
|
||||||
|
background-color: rgba(255,255,255,.5);
|
||||||
|
display: none;
|
||||||
|
left: 0; top: 0;
|
||||||
|
width: 100%;height: 100%;
|
||||||
|
z-index: 100;
|
||||||
}
|
}
|
||||||
@@ -347,6 +347,9 @@
|
|||||||
{* Change default status *}
|
{* Change default status *}
|
||||||
|
|
||||||
$('.change-default').change(function(ev) {
|
$('.change-default').change(function(ev) {
|
||||||
|
var $loader = $('<div class="loader"></div>');
|
||||||
|
$('body').append($loader);
|
||||||
|
$loader.show();
|
||||||
var url = "{url path='/admin/configuration/currencies/set-default' currency_id='__ID__'}";
|
var url = "{url path='/admin/configuration/currencies/set-default' currency_id='__ID__'}";
|
||||||
|
|
||||||
// Perform ID subtitutions
|
// Perform ID subtitutions
|
||||||
|
|||||||
Reference in New Issue
Block a user