Commit 11879e07 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

merging

parents 5999f724 5ab94d55

module/Soutenance/src/Soutenance/Controller/PropositionController.php

+2 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ class PropositionController extends AbstractController 
                } else {

                    $this->getMembreService()->create($membre);

                }

                $this->getPropositionService()->annulerValidations($proposition);

                if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidations($proposition);

            }

        }
@@ -251,7 +251,7 @@ class PropositionController extends AbstractController 
        $membre = $this->getMembreService()->getRequestedMembre($this);



        if ($membre) {

            $this->getPropositionService()->annulerValidations($membre->getProposition());

            if (!$this->isAllowed($these, PropositionPrivileges::PROPOSITION_MODIFIER_GESTION)) $this->getPropositionService()->annulerValidations($membre->getProposition());

            $this->getMembreService()->delete($membre);

        }

public/css/app.css

+4 −2
Original line number Diff line number Diff line
@@ -714,10 +714,12 @@ span.badge { 
span.badge.EN_COURS {

  background: #009ce4; }



span.badge.VALIDEE {

span.badge.VALIDEE,

span.badge.badge-success {

  background: #2EA662; }



span.badge.REJETEE {

span.badge.REJETEE,

span.badge.badge-error {

  background: #d23544; }



/*# sourceMappingURL=app.css.map */

public/css/app.css.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/css/app.scss

+7 −3
Original line number Diff line number Diff line
@@ -1099,9 +1099,13 @@ span.badge { 
span.badge.EN_COURS {

    background: $infoColor;

  }

span.badge.VALIDEE {

span.badge.VALIDEE,

span.badge.badge-success

{

    background: $successColor;

  }

span.badge.REJETEE {

span.badge.REJETEE,

span.badge.badge-error

{

    background: $dangerColor;

}