AMBARI-11343. Admin View shows wrong version number on the about tab (alexantonenko)

ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/mainCtrl.js

@@ -30,13 +30,17 @@ angular.module('ambariAdminConsole')
     Auth.signout();
   };
 
+  $scope.ambariVersion = null;
+
   $scope.about = function() {
+   var ambariVersion = $scope.ambariVersion;
   	var modalInstance = $modal.open({
   		templateUrl:'views/modals/AboutModal.html',
   		controller: ['$scope', function($scope) {
   			$scope.ok = function() {
   				modalInstance.close();
   			};
+        $scope.ambariVersion = ambariVersion;
   		}]
   	});
   };
@@ -46,6 +50,12 @@ angular.module('ambariAdminConsole')
   $scope.cluster = null;
   $scope.isLoaded = null;
 
+  function loadAmbariVersion() {
+    Cluster.getAmbariVersion().then(function(version){
+      $scope.ambariVersion = version;
+    });
+  }
+
   function loadClusterData(){
     Cluster.getStatus().then(function(cluster) {
       $scope.cluster = cluster;
@@ -58,6 +68,7 @@ angular.module('ambariAdminConsole')
     });
   }
   loadClusterData();
+  loadAmbariVersion();
 
   $scope.viewInstances = [];
   View.getAllVisibleInstance().then(function(instances) {

ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Cluster.js

@@ -47,6 +47,19 @@ angular.module('ambariAdminConsole')
 
       return deferred.promise;
     },
+    getAmbariVersion: function() {
+      var deferred = $q.defer();
+
+      $http.get(Settings.baseUrl + '/services/AMBARI/components/AMBARI_SERVER?fields=RootServiceComponents/component_version,RootServiceComponents/properties/server.os_family&minimal_response=true', {mock: '2.1'})
+      .then(function(data) {
+        deferred.resolve(data.data.RootServiceComponents.component_version);
+      })
+      .catch(function(data) {
+        deferred.reject(data);
+      });
+
+      return deferred.promise;
+    },
     getPermissions: function() {
       var deferred = $q.defer();
 
@@ -165,4 +178,4 @@ angular.module('ambariAdminConsole')
       return deferred.promise;
     }
   };
-}]);
+}]);

ambari-admin/src/main/resources/ui/admin-web/app/views/modals/AboutModal.html

@@ -28,7 +28,9 @@
       <div class="project">Apache Ambari</div>
       <br>
       <span id="i18n-33">Version</span>
-      <script id="metamorph-199-start" type="text/x-placeholder"></script>2.0.0<script id="metamorph-199-end" type="text/x-placeholder"></script>
+      <script id="metamorph-199-start" type="text/x-placeholder"></script>
+      <span ng-bind="ambariVersion"></span>
+      <script id="metamorph-199-end" type="text/x-placeholder"></script>
       <br>
       <br>
       <a href="http://ambari.apache.org/" target="_blank"><span id="i18n-34">Get involved!</span></a>
@@ -39,4 +41,4 @@
 </div>
 <div class="modal-footer">
     <button class="btn btn-success" ng-click="ok()">OK</button>
-</div>
+</div>