From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 11 Jul 2017 02:10:42 +0000 (-0400)
Subject: mgr/dashboard: moved short_version formatter to common location
X-Git-Tag: v12.1.2~151^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0a31628e8431b83a14538c089f6b2f2b8aa082b8;p=ceph.git

mgr/dashboard: moved short_version formatter to common location

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/base.html b/src/pybind/mgr/dashboard/base.html
index dc97f48d111..da01000cc6f 100644
--- a/src/pybind/mgr/dashboard/base.html
+++ b/src/pybind/mgr/dashboard/base.html
@@ -115,6 +115,19 @@
                 return format_number(n, 1024, ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']);
             };
 
+            rivets.formatters.short_version = function(version) {
+                // Expect "ceph version 1.2.3-g9asdasd (as98d7a0s8d7)"
+                var result = /ceph version\s+([^ ]+)\s+\(.+\)/.exec(version);
+                if (result) {
+                    // Return the "1.2.3-g9asdasd" part
+                    return result[1];
+                } else {
+                    // Unexpected format, pass it through
+                    return version;
+                }
+                return
+            };
+
             /* This is useful if you need to display some alternative text
              * when a collection is empty using rv-hide */
             rivets.formatters.length = function(val) {
diff --git a/src/pybind/mgr/dashboard/servers.html b/src/pybind/mgr/dashboard/servers.html
index 301bca24bbe..e6c8b3cf603 100644
--- a/src/pybind/mgr/dashboard/servers.html
+++ b/src/pybind/mgr/dashboard/servers.html
@@ -23,19 +23,6 @@
                 return strings.join(", ");
             };
 
-            rivets.formatters.short_version = function(version) {
-                // Expect "ceph version 1.2.3-g9asdasd (as98d7a0s8d7)"
-                var result = /ceph version\s+([^ ]+)\s+\(.+\)/.exec(version);
-                if (result) {
-                    // Return the "1.2.3-g9asdasd" part
-                    return result[1];
-                } else {
-                    // Unexpected format, pass it through
-                    return version;
-                }
-                return 
-            };
-
             rivets.bind($("#content"), content_data);
         });