From a6e36a968f5ce8ded9031c1e3b097fcdf7097ff6 Mon Sep 17 00:00:00 2001
From: jpl
Date: Thu, 29 Dec 2016 16:09:40 +0100
Subject: adding close modale after saving modalprops

---
 .../es6_browserified/journey_patterns/components/Modal.js           | 6 +++++-
 .../javascripts/es6_browserified/journey_patterns/reducers/modal.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
index cfc53d302..9a2165da2 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/Modal.js
@@ -38,7 +38,10 @@ class ModalComponent extends Component {
                   <li>
                     <a
                       href='#'
-                      onClick={() => this.props.onDeleteJourneyPattern(this.props.modal.modalProps.index, this.props.modal.modalProps.journeyPattern)}
+                      onClick={(e) => {
+                        e.preventDefault()
+                        this.props.onDeleteJourneyPattern(this.props.modal.modalProps.index, this.props.modal.modalProps.journeyPattern)}
+                      }
                       >
                       Supprimer la mission
                     </a>
@@ -107,6 +110,7 @@ class ModalComponent extends Component {
               </button>
               <button
                 className='btn btn-danger'
+                data-dismiss='modal'
                 type='button'
                 onClick={this.handleSubmit.bind(this)}
                 >
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
index 577987997..c2abb0d42 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/reducers/modal.js
@@ -32,12 +32,12 @@ const modal = (state = {}, action) => {
       })
     case 'SAVE_MODAL':
       return Object.assign({}, state, {
+        open: false,
         modalProps: {
           index: state.modalProps.index,
           journeyPattern: updatedJourneyPattern(state.modalProps.journeyPattern, action)
         }
       })
-
     case 'CLOSE_MODAL':
       return {
         open: false,
-- 
cgit v1.2.3