Browse Source

Merge branch 'develop' of https://forge.laclic.fr/Laclic/SovBundle into develop

develop
Fabien Normand 3 years ago
parent
commit
c4f02ef428
2 changed files with 17 additions and 1 deletions
  1. +1
    -1
      Resources/assets/app/adminlte/main/scss/_common.scss
  2. +16
    -0
      Solver/Setting/SettingSolver.php

+ 1
- 1
Resources/assets/app/adminlte/main/scss/_common.scss View File

@@ -48,7 +48,7 @@ table.fixedHeader-floating{margin-top: 0px !important;}
#list_filter_id{width: 60px;}

.delivery-field .form-group{display: inline-block; margin-bottom: 0px; margin-right: 15px;}
.delivery-field .form-group .form-control{width: 150px;}
.delivery-field .form-group .form-control{width: 90px;}

.table{
thead a{color: #212529}

+ 16
- 0
Solver/Setting/SettingSolver.php View File

@@ -44,4 +44,20 @@ class SettingSolver

return null;
}

public function getDefaultValue(EntityInterface $entity, $settingDefault)
{
$valueDefault = null;

if(is_array($settingDefault)) {
if(isset($settingDefault[$entity->getDevAlias()])) {
$valueDefault = $settingDefault[$entity->getDevAlias()];
}
}
else {
$valueDefault = $settingDefault;
}

return $valueDefault;
}
}

Loading…
Cancel
Save