From a8417ac14f8199c0154ae316c41b4e7be3b9c344 Mon Sep 17 00:00:00 2001
From: Olivier ORAND <olivier.orand@orange.com>
Date: Wed, 24 May 2017 15:09:55 +0200
Subject: [PATCH] Fix: test if service_plan is null (Error message: Error:
 a.service_plan is undefined b.getApplicationsForTheSpace...); close #17

---
 .travis.yml                                  |  8 ++++++--
 src/app/components/space/spaceDetailsCtrl.js | 14 ++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d421a1b..d0f209b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,16 @@ script:
 before_deploy:
 - mv build cf-webui
 - tar czvf cf-webui-${TRAVIS_TAG}.tgz cf-webui
+- sha512sum cf-webui-${TRAVIS_TAG}.tgz > cf-webui-${TRAVIS_TAG}.tgz.sha512
 deploy:
   skip_cleanup: true
   provider: releases
   api_key:
     secure: L8w2QEogWsNdMBGHEhwhMlzEzNiKSCjy5nQefa2PidXxPKotRI00/lBve1+BH6GLNfpLfRDpZU0OkgmzyofrwT3ONl2ppBrwneXfHOoKnQwa9ZsLi/rZuBQL0+lYd1e8gt+d+xq5qVJ2UfKDh041N05fb8a2kKZishFV3IP/Gc/VdXgKBcooLbX2guaxlF+DwgrAmB+mCvF0eWgzWP8RDujojbZe6dD2YrOgVONHsAPp0JY17vIlU0unBTmVBRRc5r9MmtS9EB54xlHF8SQr4XgB4D3Rrx1JjymX06h4LJ7FeBtu7cV4Ru94/R3wsfWPoUgvLTbYjB2RZS40xImZfmXqTVoiMb6aO9m0bIPW/MFpkeNiXuHZjEwg1oHM0cjXgJvw+qDf22KhS6/hcKs8qCwqsl259EWICJ8YMyYAYKgpAv3nWaCC93OZA+6OoVMP3SReTUxJmtI0kyXmuMaW3+mO82hEYJx+XhvkxcMI8NztmBzvmb5dQ0GEocujr1TgJ6mUWOm8BsUrbWRwmOPxLcMMMhMlCsw1dVb4C3q4mPF/DxQxAnIfpwFWFN0QX4aSuAAq1YWZrvP8XftNYOMwTEMV8ZYQ5CFGeVC+LYU1kUNPT3IKKfCzG4yHerr3LawRgxSqZcMcYJygx2DNdtx/aN2/NYmmDKxS+Ce55nbxvbs=
-  file: cf-webui-${TRAVIS_TAG}.tgz
+  file:
+  - cf-webui-${TRAVIS_TAG}.tgz
+  - cf-webui-${TRAVIS_TAG}.tgz.sha512
+
   on:
-    tag: true
+    tags: true
     repo: orange-cloudfoundry/cf-webui
diff --git a/src/app/components/space/spaceDetailsCtrl.js b/src/app/components/space/spaceDetailsCtrl.js
index 9fcca9e..a2e59b2 100644
--- a/src/app/components/space/spaceDetailsCtrl.js
+++ b/src/app/components/space/spaceDetailsCtrl.js
@@ -116,14 +116,20 @@ angular.module('app.space').controller('SpaceDetailsCtrl', ['$rootScope', '$scop
         $scope.nrOfServices = response.data.services.length;
 
         angular.forEach(response.data.services, function(service, i) {
+          var serviceLabel='';
+          var service_planName='';
+          if (service.service_plan) {
+            serviceLabel=service.service_plan.service.label;
+            service_planName=', ' + service.service_plan.name;
+          }
           var objectService = {
             id: service.guid,
             name: service.name,
-            servicePlan: service.service_plan.service.label + ', ' + service.service_plan.name,
+            servicePlan: serviceLabel + service_planName,
             nrOfBoundApps: service.bound_app_count,
             dashboardUrl: service.dashboard_url,
-            supportURL:'https://support.'+service.service_plan.service.label+'.com/',
-            docsURL: 'http://docs.run.pivotal.io/marketplace/services/'+service.service_plan.service.label+'.html'
+            supportURL:'https://support.'+serviceLabel+'.com/',
+            docsURL: 'http://docs.run.pivotal.io/marketplace/services/'+serviceLabel+'.html'
           };
 
           $scope.services.push(objectService);
@@ -714,4 +720,4 @@ angular.module('app.space').controller('SpaceDetailsCtrl', ['$rootScope', '$scop
 
   };
 
-}]);
\ No newline at end of file
+}]);