differentiate urls from branches version and release versions (#486)

medialab · Sep 8, 2023 · 112c61a · 112c61a
1 parent f70f79d
commit 112c61a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/hyphe_frontend/app/views/help.html b/hyphe_frontend/app/views/help.html
@@ -72,7 +72,7 @@ <h2>
             <div class="pusher"></div>
           </div>
           <md-list class="credits-list-footer">
-            <md-list-item ng-if="version" ng-href="https://github.com/medialab/hyphe/tree/{{version}}" target="_blank" aria-label="médialab website">
+            <md-list-item ng-if="version" ng-href="{{version_url}}" target="_blank" aria-label="médialab website">
               <span layout-padding >
                 Hyphe {{version}}
               </span>

diff --git a/hyphe_frontend/app/views/help.js b/hyphe_frontend/app/views/help.js
@@ -18,6 +18,8 @@ angular.module('hyphe.helpController', ['ngSanitize'])
     $scope.currentPage = 'help'
 
     $scope.version = null
+    $scope.version_url = null
+
     $scope.corpusName = corpus.getName(config.get('extraTitle') || '')
     $scope.corpusId = corpus.getId()
     $scope.headerCustomColor = config.get('headerCustomColor') || '#328dc7';
@@ -43,6 +45,9 @@ angular.module('hyphe.helpController', ['ngSanitize'])
 
     $http({url: "conf/VERSION"}).then(function(res){
       $scope.version = res.data.replace(/[\n\r]/, '').replace(/^(\d)/, 'v$1')
+      if (!/^v\d/.test($scope.version))
+        $scope.version_url = "https://github.com/medialab/hyphe/tree/" + $scope.version
+      else $scope.version_url = "https://github.com/medialab/hyphe/releases/tag/" + $scope.version
     }, function() {})
 
     $scope.$watchGroup(['highlightedEntry', 'definitions'], function (newValues, oldValues) {

diff --git a/hyphe_frontend/app/views/login.html b/hyphe_frontend/app/views/login.html
@@ -191,7 +191,7 @@ <h3>Login to {{ corpus.name }}</h3>
 
     <div  layout="row"  class="credits-list" layout-align="center"  md-colors="{background: 'default-background-100'}">
 
-      <md-list-item ng-if="version" ng-href="https://github.com/medialab/hyphe/tree/{{version}}" target="_blank" aria-label="Hyphe version">
+      <md-list-item ng-if="version" ng-href="{{version_url}}" target="_blank" aria-label="Hyphe version">
         <span layout-padding >
           Hyphe {{version}}
         </span>

diff --git a/hyphe_frontend/app/views/login.js b/hyphe_frontend/app/views/login.js
@@ -7,6 +7,7 @@ angular.module('hyphe.loginController', [])
     $scope.currentPage = 'login'
 
     $scope.version = null
+    $scope.version_url = null
 
     $scope.corpusList
     $scope.corpusList_byId = {}
@@ -93,6 +94,9 @@ angular.module('hyphe.loginController', [])
     $scope.$on('$destroy', function(){ clearInterval($scope.loop) })
     $http({url: "conf/VERSION"}).then(function(res){
       $scope.version = res.data.replace(/[\n\r]/, '').replace(/^(\d)/, 'v$1')
+      if (!/^v\d/.test($scope.version))
+        $scope.version_url = "https://github.com/medialab/hyphe/tree/" + $scope.version
+      else $scope.version_url = "https://github.com/medialab/hyphe/releases/tag/" + $scope.version
     }, function() {})
 
     function refresh(){