trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dang...@apache.org
Subject [1/2] incubator-trafficcontrol git commit: fixes tp release info dialog
Date Tue, 11 Jul 2017 20:35:27 GMT
Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 271f871a6 -> 474de97fe


fixes tp release info dialog


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/620119c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/620119c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/620119c7

Branch: refs/heads/master
Commit: 620119c707c5929ebcdef37e635748aab6c67345
Parents: 271f871
Author: Jeremy Mitchell <mitchell852@gmail.com>
Authored: Tue Jul 11 12:01:07 2017 -0600
Committer: Dan Kirkwood <dangogh@gmail.com>
Committed: Tue Jul 11 14:34:14 2017 -0600

----------------------------------------------------------------------
 .../modules/navigation/NavigationController.js      |  2 +-
 traffic_portal/app/src/traffic_portal_release.json  |  1 -
 traffic_portal/build/traffic_portal.spec            | 16 ++++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/620119c7/traffic_portal/app/src/common/modules/navigation/NavigationController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/modules/navigation/NavigationController.js b/traffic_portal/app/src/common/modules/navigation/NavigationController.js
index 2c39b84..5b7cefb 100644
--- a/traffic_portal/app/src/common/modules/navigation/NavigationController.js
+++ b/traffic_portal/app/src/common/modules/navigation/NavigationController.js
@@ -59,7 +59,7 @@ var NavigationController = function($scope, $log, $state, $location, $window,
$t
                     size: 'sm',
                     resolve: {
                         params: function () {
-                            return result;
+                            return result.data;
                         }
                     }
                 });

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/620119c7/traffic_portal/app/src/traffic_portal_release.json
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/traffic_portal_release.json b/traffic_portal/app/src/traffic_portal_release.json
index 78fc5f3..e377645 100644
--- a/traffic_portal/app/src/traffic_portal_release.json
+++ b/traffic_portal/app/src/traffic_portal_release.json
@@ -1,5 +1,4 @@
 {
     "Version":"0.1",
-    "Build Number":"1",
     "Build Date":"2016-01-01 16:25:27"
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/620119c7/traffic_portal/build/traffic_portal.spec
----------------------------------------------------------------------
diff --git a/traffic_portal/build/traffic_portal.spec b/traffic_portal/build/traffic_portal.spec
index db9a689..a74ab0a 100644
--- a/traffic_portal/build/traffic_portal.spec
+++ b/traffic_portal/build/traffic_portal.spec
@@ -52,14 +52,6 @@ tar -xzvf $RPM_SOURCE_DIR/traffic_portal-%{version}.tgz
     %__mkdir -p ${RPM_BUILD_ROOT}%{traffic_portal_home}/server
     %__mkdir -p ${RPM_BUILD_ROOT}/var/log/traffic_portal
 
-    # creates dynamic json file needed at runtime for traffic portal to display release info
-    BUILD_DATE=$(date +'%Y-%m-%d %H:%M:%S')
-    VERSION="\"Version\":\"$VERSION\""
-    BUILD_NUMBER="\"Build Number\":\"$BUILD_NUMBER\""
-    BUILD_DATE="\"Build Date\":\"$BUILD_DATE\""
-    JSON_VERSION="{\n$VERSION,\n$BUILD_NUMBER,\n$BUILD_DATE\n}"
-    echo -e $JSON_VERSION > ${RPM_BUILD_ROOT}%{traffic_portal_home}/public/traffic_portal_release.json
-
     %__cp ${RPM_BUILD_DIR}/traffic_portal-%{version}/server.js ${RPM_BUILD_ROOT}%{traffic_portal_home}/.
     %__cp -r ${RPM_BUILD_DIR}/traffic_portal-%{version}/conf ${RPM_BUILD_ROOT}/etc/traffic_portal/.
     %__cp ${RPM_BUILD_DIR}/traffic_portal-%{version}/build/etc/init.d/traffic_portal ${RPM_BUILD_ROOT}/etc/init.d/.
@@ -67,6 +59,14 @@ tar -xzvf $RPM_SOURCE_DIR/traffic_portal-%{version}.tgz
     %__cp ${RPM_BUILD_DIR}/traffic_portal-%{version}/build/etc/logrotate.d/traffic_portal-access
${RPM_BUILD_ROOT}/etc/logrotate.d/.
     %__cp -r ${RPM_BUILD_DIR}/traffic_portal-%{version}/app/dist/* ${RPM_BUILD_ROOT}%{traffic_portal_home}/.
 
+	# creates dynamic json file needed at runtime for traffic portal to display release info
+	VERSION=%{version}-%{build_number}
+	BUILD_DATE=$(date +'%Y-%m-%d %H:%M:%S')
+	VERSION="\"Version\":\"$VERSION\""
+	BUILD_DATE="\"Build Date\":\"$BUILD_DATE\""
+	JSON_VERSION="{\n$VERSION,\n$BUILD_DATE\n}"
+	echo -e $JSON_VERSION > ${RPM_BUILD_ROOT}%{traffic_portal_home}/public/traffic_portal_release.json
+
 %post
     echo "Successfully installed the traffic_portal assets to " %{traffic_portal_home}
     %__chmod +x %{traffic_portal_home}/node_modules/forever/bin/forever


Mime
View raw message