Merge pull request #38 from grycap/devel

Devel
grycap · Jul 7, 2020 · 81212eb · 81212eb
2 parents f2a4b1b + 4a584ec
commit 81212eb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/app/__init__.py b/app/__init__.py
@@ -384,10 +384,9 @@ def infoutputs(infid=None):
 
         return render_template('outputs.html', infid=infid, outputs=outputs)
 
-    @app.route('/delete/<infid>')
+    @app.route('/delete/<infid>/<force>')
     @authorized_with_valid_token
-    def infdel(infid=None, force=False):
-
+    def infdel(infid=None, force=0):
         access_token = oidc_blueprint.session.token['access_token']
         auth_data = utils.getUserAuthData(access_token, cred, session["userid"])
         headers = {"Authorization": auth_data}

diff --git a/app/settings.py b/app/settings.py
@@ -24,8 +24,8 @@
 class Settings:
     def __init__(self, config):
         """Creator function."""
-        self.toscaDir = config['TOSCA_TEMPLATES_DIR'] + "/"
-        self.toscaParamsDir = config.get('TOSCA_PARAMETERS_DIR') + "/"
+        self.toscaDir = config.get('TOSCA_TEMPLATES_DIR', '') + "/"
+        self.toscaParamsDir = config.get('TOSCA_PARAMETERS_DIR', '') + "/"
         self.imUrl = config['IM_URL']
         self.oidcUrl = config['OIDC_BASE_URL']
         self.tempSlamUrl = config.get('SLAM_URL') if config.get('SLAM_URL') else ""

diff --git a/app/templates/infrastructures.html b/app/templates/infrastructures.html
@@ -102,8 +102,8 @@ <h5 class="modal-title" id="delete_confirm_label_{{infId}}">Confirm Infrastructu
                       </div>
                       <div class="modal-footer">
                         <a class="btn btn-primary cancelBtn" role="button" data-dismiss="modal">Cancel</a>
-                        <a class="btn btn-danger deleteBtn" role="button" href="{{ url_for("infdel", infid=infId) }}">Delete</a>
-                        <a class="btn btn-danger foceDeleteBtn" role="button" title="The infrastructure will be deleted even if sonme resources are not correctly deleted" href="{{ url_for("infdel", infid=infId, force=True) }}"><span class="fas fa-exclamation-triangle mr-2"></span>Force Delete</a>
+                        <a class="btn btn-danger deleteBtn" role="button" href="{{ url_for('infdel', infid=infId, force=0) }}">Delete</a>
+                        <a class="btn btn-danger foceDeleteBtn" role="button" title="The infrastructure will be deleted even if sonme resources are not correctly deleted" href="{{ url_for('infdel', infid=infId, force=1) }}"><span class="fas fa-exclamation-triangle mr-2"></span>Force Delete</a>
                       </div>
                     </div>
                   </div>

diff --git a/app/tests/test_app.py b/app/tests/test_app.py
@@ -279,7 +279,7 @@ def test_delete(self, flash, avatar, delete, user_data):
         user_data.return_value = "type = InfrastructureManager; token = access_token"
         delete.side_effect = self.delete_response
         self.login(avatar)
-        res = self.client.get('/delete/infid')
+        res = self.client.get('/delete/infid/0')
         self.assertEqual(302, res.status_code)
         self.assertIn('http://localhost/infrastructures', res.headers['location'])
         self.assertEquals(flash.call_args_list[0][0], ("Infrastructure 'infid' successfuly deleted.", 'info'))