Merge branch 'release/1.12.4'

api/portainer.go

@@ -176,7 +176,7 @@ type (
 
 const (
 	// APIVersion is the version number of Portainer API.
-	APIVersion = "1.12.3"
+	APIVersion = "1.12.4"
 	// DBVersion is the version number of Portainer database.
 	DBVersion = 1
 )

app/app.js

@@ -594,4 +594,4 @@ angular.module('portainer', [
   .constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
   .constant('TEMPLATES_ENDPOINT', 'api/templates')
   .constant('PAGINATION_MAX_ITEMS', 10)
-  .constant('UI_VERSION', 'v1.12.3');
+  .constant('UI_VERSION', 'v1.12.4');

app/components/service/serviceController.js

@@ -157,7 +157,7 @@ function ($scope, $stateParams, $state, $location, $anchorScroll, Service, Servi
   };
 
   $scope.updateService = function updateService(service) {
-    $('#loadServicesSpinner').show();
+    $('#loadingViewSpinner').show();
     var config = ServiceHelper.serviceToConfig(service.Model);
     config.Name = service.Name;
     config.Labels = translateServiceLabelsToLabels(service.ServiceLabels);
@@ -198,11 +198,13 @@ function ($scope, $stateParams, $state, $location, $anchorScroll, Service, Servi
       Window: service.RestartWindow
     };
 
-    service.Ports.forEach(function (binding) {
-      if (binding.PublishedPort === null || binding.PublishedPort === '') {
-        delete binding.PublishedPort;
-      }
-    });
+    if (service.Ports) {
+      service.Ports.forEach(function (binding) {
+        if (binding.PublishedPort === null || binding.PublishedPort === '') {
+          delete binding.PublishedPort;
+        }
+      });
+    }
 
     config.EndpointSpec = {
       Mode: config.EndpointSpec.Mode || 'vip',
@@ -210,12 +212,12 @@ function ($scope, $stateParams, $state, $location, $anchorScroll, Service, Servi
     };
 
     Service.update({ id: service.Id, version: service.Version }, config, function (data) {
-      $('#loadServicesSpinner').hide();
+      $('#loadingViewSpinner').hide();
       Messages.send("Service successfully updated", "Service updated");
       $scope.cancelChanges({});
       fetchServiceDetails();
     }, function (e) {
-      $('#loadServicesSpinner').hide();
+      $('#loadingViewSpinner').hide();
       Messages.error("Failure", e, "Unable to update service");
     });
   };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "portainer",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "homepage": "https://github.com/portainer/portainer",
   "authors": [
     "Anthony Lapenna <anthony.lapenna at gmail dot com>"

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"