From e3619ecb0c6f20878ff308eb9a1096c458d8c7f7 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Fri, 10 Mar 2017 15:50:21 +0200
Subject: [PATCH] Version set to 1.2.1-SNAPSHOT. Minor bug fixes.

---
 application/pom.xml                                     | 2 +-
 common/data/pom.xml                                     | 2 +-
 common/message/pom.xml                                  | 2 +-
 common/pom.xml                                          | 2 +-
 common/transport/pom.xml                                | 2 +-
 dao/pom.xml                                             | 2 +-
 extensions-api/pom.xml                                  | 2 +-
 extensions-core/pom.xml                                 | 2 +-
 extensions/extension-kafka/pom.xml                      | 2 +-
 extensions/extension-rabbitmq/pom.xml                   | 2 +-
 extensions/extension-rest-api-call/pom.xml              | 2 +-
 extensions/pom.xml                                      | 2 +-
 pom.xml                                                 | 2 +-
 tools/pom.xml                                           | 2 +-
 transport/coap/pom.xml                                  | 2 +-
 transport/http/pom.xml                                  | 2 +-
 transport/mqtt/pom.xml                                  | 2 +-
 transport/pom.xml                                       | 2 +-
 ui/pom.xml                                              | 2 +-
 ui/src/app/dashboard/aliases-device-select.directive.js | 2 +-
 ui/src/app/dashboard/dashboard.controller.js            | 3 ++-
 21 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 60a120bbe2..a96699f2e1 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/common/data/pom.xml b/common/data/pom.xml
index 9e466ae782..904d8c2749 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/message/pom.xml b/common/message/pom.xml
index 19e7e0ef5a..3fb8f74f3e 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index c5ea746299..a6f2b7b141 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 021f8fe251..3d31644726 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/dao/pom.xml b/dao/pom.xml
index f96c3d298a..31ccf6e583 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/extensions-api/pom.xml b/extensions-api/pom.xml
index a1e616c965..d34474ff5a 100644
--- a/extensions-api/pom.xml
+++ b/extensions-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml
index d354f9857e..0d3d512c01 100644
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/extensions/extension-kafka/pom.xml b/extensions/extension-kafka/pom.xml
index 7a41a77252..f48dfa33a3 100644
--- a/extensions/extension-kafka/pom.xml
+++ b/extensions/extension-kafka/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>
diff --git a/extensions/extension-rabbitmq/pom.xml b/extensions/extension-rabbitmq/pom.xml
index f5ef5bb7f0..22d87dc10e 100644
--- a/extensions/extension-rabbitmq/pom.xml
+++ b/extensions/extension-rabbitmq/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>
diff --git a/extensions/extension-rest-api-call/pom.xml b/extensions/extension-rest-api-call/pom.xml
index 751a6ba3a0..9b2d774c96 100644
--- a/extensions/extension-rest-api-call/pom.xml
+++ b/extensions/extension-rest-api-call/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index e24121fd1b..05fdd4f000 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/pom.xml b/pom.xml
index 66dbbf5dfa..efc0bd0c17 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>
diff --git a/tools/pom.xml b/tools/pom.xml
index 927114246a..acfcb06f7f 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 75ad1c7e3c..0634a0ff30 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index 630c747ed4..ab9130aa63 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 902ef19da2..d126e65ba9 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/pom.xml b/transport/pom.xml
index 375a0b378b..fe0342dba8 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/ui/pom.xml b/ui/pom.xml
index 47e3ef8e25..1ec7dec19d 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
diff --git a/ui/src/app/dashboard/aliases-device-select.directive.js b/ui/src/app/dashboard/aliases-device-select.directive.js
index 6f0a889e7d..767b34cf01 100644
--- a/ui/src/app/dashboard/aliases-device-select.directive.js
+++ b/ui/src/app/dashboard/aliases-device-select.directive.js
@@ -121,7 +121,7 @@ export default function AliasesDeviceSelectDirective($compile, $templateCache, $
                     break;
                 }
             }
-            if (singleValue) {
+            if (singleValue && currentAliasId) {
                 var deviceId = scope.model[currentAliasId].deviceId;
                 var devicesInfo = scope.deviceAliasesInfo[currentAliasId];
                 for (var i=0;i<devicesInfo.length;i++) {
diff --git a/ui/src/app/dashboard/dashboard.controller.js b/ui/src/app/dashboard/dashboard.controller.js
index b2ec482281..2bb148b736 100644
--- a/ui/src/app/dashboard/dashboard.controller.js
+++ b/ui/src/app/dashboard/dashboard.controller.js
@@ -307,7 +307,8 @@ export default function DashboardController(types, widgetService, userService,
             fullscreen: true,
             targetEvent: $event
         }).then(function (gridSettings) {
-            var prevColumns = vm.dashboard.configuration.gridSettings.columns;
+            var prevGridSettings = vm.dashboard.configuration.gridSettings;
+            var prevColumns = prevGridSettings ? prevGridSettings.columns : 24;
             var ratio = gridSettings.columns / prevColumns;
             var currentWidgets = angular.copy(vm.widgets);
             vm.widgets = [];