Bug fixes for creating Service at show level. (#818)

DiegoTavares · web-flow · commit 459ce4aefd69 · 2020-12-11T11:50:52.000-05:00
diff --git a/cuegui/cuegui/MenuActions.py b/cuegui/cuegui/MenuActions.py
@@ -1085,7 +1085,7 @@ def taskProperties(self, rpcObjects=None):
                 opencue.api.findShow(rootgroup.data.name), self._caller).show()
 
 
-    serviceProperties_info = ["Service Properies...", None, "view"]
+    serviceProperties_info = ["Service Properties...", None, "view"]
     def serviceProperties(self, rpcObjects=None):
         for rootgroup in self._getOnlyRootGroupObjects(rpcObjects):
             cuegui.ServiceDialog.ServiceDialog(
diff --git a/cuegui/cuegui/ServiceDialog.py b/cuegui/cuegui/ServiceDialog.py
@@ -108,16 +108,13 @@ def setService(self, service):
         Update the form with data from the given service.
         """
         self.__buttons.setDisabled(False)
-        self.__service = service.data
-
-        self.name.setText(self.__service.name)
-        self.threadable.setChecked(self.__service.threadable)
-        self.min_cores.setValue(self.__service.min_cores)
-        self.max_cores.setValue(self.__service.max_cores)
-        self.min_memory.setValue(self.__service.min_memory // 1024)
-        self.min_gpu.setValue(self.__service.min_gpu // 1024)
-
-        self._tags_w.set_tags(self.__service.tags)
+        self.name.setText(service.data.name)
+        self.threadable.setChecked(service.data.threadable)
+        self.min_cores.setValue(service.data.min_cores)
+        self.max_cores.setValue(service.data.max_cores)
+        self.min_memory.setValue(service.data.min_memory // 1024)
+        self.min_gpu.setValue(service.data.min_gpu // 1024)
+        self._tags_w.set_tags(service.data.tags)
 
     def new(self):
         """
@@ -257,17 +254,15 @@ def refresh(self):
                         self.__service_list.selectedItems()]
 
         self.__service_list.clear()
-        try:
-            if not self.__show:
-                self.__services = opencue.api.getDefaultServices()
-            else:
-                self.__services = self.__show.getServiceOverrides()
-        except Exception:
-            return
+        if not self.__show:
+            self.__services = opencue.api.getDefaultServices()
+        else:
+            self.__services = self.__show.getServiceOverrides()
 
         for service in self.__services:
             item = QtWidgets.QListWidgetItem(service.name())
             self.__service_list.addItem(item)
+
             if service.name() in selected:
                 item.setSelected(True)
 
diff --git a/pycue/opencue/wrappers/show.py b/pycue/opencue/wrappers/show.py
@@ -68,6 +68,28 @@ def delete(self):
         """Delete this show"""
         self.stub.Delete(show_pb2.ShowDeleteRequest(show=self.data), timeout=Cuebot.Timeout)
 
+    def createServiceOverride(self, data):
+        """Creates a Service Override at the show level.
+
+        :type data: opencue.wrapper.service.Service
+        :param data: Service.data object
+        """
+        self.stub.CreateServiceOverride(show_pb2.ShowCreateServiceOverrideRequest(
+                                        show=self.data, service=data),
+                                        timeout=Cuebot.Timeout)
+
+    def getServiceOverride(self, serviceName):
+        """
+        Returns a service override for a show
+
+        :param serviceName: name of the service for the show
+        :return: service override object
+        """
+        serviceOverride = self.stub.GetServiceOverride(show_pb2.ShowGetServiceOverrideRequest(
+                                                       show=self.data, name=serviceName),
+                                                       timeout=Cuebot.Timeout).service_override
+        return serviceOverride
+
     def getServiceOverrides(self):
         """Returns a list of service overrides on the show.
 
