[HOPSWORKS-933] Fix bug with project services (#131)

logicalclocks · Feb 11, 2019 · 25b4909 · 25b4909
1 parent 058f119
commit 25b4909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/project/ProjectController.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/project/ProjectController.java
@@ -731,8 +731,6 @@ public List<Future<?>> addService(Project project, ProjectServiceEnum service,
  break;
  case HIVE:
  addServiceHive(project, user, dfso);
- //HOPSWORKS-198: Enable Zeppelin at the same time as Hive
- addServiceDataset(project, user, Settings.ServiceDataset.ZEPPELIN, dfso, udfso);
  break;
  case SERVING:
  futureList.add(addServiceServing(project, user, dfso, udfso));
@@ -760,11 +758,6 @@ public List<Future<?>> addService(Project project, ProjectServiceEnum service,
  projectServicesFacade.addServiceForProject(project, service);
  logActivity(ActivityFacade.ADDED_SERVICE + service.toString(), user, project, ActivityFacade.
  ActivityFlag.SERVICE);
- if (service == ProjectServiceEnum.HIVE) {
- projectServicesFacade.addServiceForProject(project, ProjectServiceEnum.ZEPPELIN);
- logActivity(ActivityFacade.ADDED_SERVICE + ProjectServiceEnum.ZEPPELIN.toString(), user, project, 
- ActivityFacade.ActivityFlag.SERVICE);
- }
  return futureList;
  }
 

diff --git a/hopsworks-web/yo/app/scripts/controllers/projectCtrl.js b/hopsworks-web/yo/app/scripts/controllers/projectCtrl.js
@@ -161,10 +161,11 @@ angular.module('hopsWorksApp')
  });
 
  // Remove already choosen services from the service selection
- // Check if airflow there already.
  self.alreadyChoosenServices.forEach(function (entry) {
  var index = self.projectTypes.indexOf(entry.toUpperCase());
- self.projectTypes.splice(index, 1);
+ if (index >= 0) {
+ self.projectTypes.splice(index, 1);
+ }
  });