Merge pull request goharbor#821 from wknet123/dev

Updates for showing version on UI.
wy65701436 · Sep 20, 2016 · 4085876 · 4085876
2 parents 03c6a7a + edc10fc
commit 4085876
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/controllers/base.go b/controllers/base.go
@@ -113,8 +113,6 @@ func (b *BaseController) Prepare() {
 		b.SelfRegistration = true
 	}
 	b.Data["SelfRegistration"] = b.SelfRegistration
-
-	b.Data["Version"] = os.Getenv("VERSION")
 }
 
 // Forward to setup layout and template for content for a page.

diff --git a/static/resources/js/components/optional-menu/optional-menu.directive.js b/static/resources/js/components/optional-menu/optional-menu.directive.js
@@ -57,7 +57,7 @@
     }
     function about() {
       $scope.$emit('modalTitle', $filter('tr')('about_harbor'));
-      $scope.$emit('modalMessage', $filter('tr')('current_version', [vm.version]));
+      $scope.$emit('modalMessage', $filter('tr')('current_version', [vm.version || 'Unknown']));
       var raiseInfo = {
         'confirmOnly': true,
         'contentType': 'text/html',