6.13.0

vanderbilt-redcap · Aug 21, 2024 · 161d320 · 161d320
1 parent 7b9fbc6
commit 161d320
Show file tree

Hide file tree

Showing 38 changed files with 3,068 additions and 1,554 deletions.
diff --git a/Application.php b/Application.php
@@ -364,9 +364,7 @@ public static function getHeader($tokenName = "", $token = "", $server = "", $pi
         $token = $token ?: self::getSetting("token", $pid);
         $server = $server?: self::getSetting("server", $pid);
 
-        if (!$tokenName) {
-            $tokenName = self::getSetting("tokenName", $pid);
-        }
+        $tokenName = Download::shortProjectTitle($pid);
         $module = self::getModule();
         $museoSansLink = self::link("/fonts/exljbris - MuseoSans-500.otf");
         $horizontalScrollbar = CareerDev::isREDCap() ? ":root { overflow-x: scroll; }" : "";

diff --git a/CareerDev.php b/CareerDev.php
@@ -22,7 +22,7 @@ class CareerDev {
 	public static $passedModule = NULL;
 
 	public static function getVersion() {
-		return "6.12.1";
+		return "6.13.0";
 	}
 
     public static function getLocalhostPluginPid() {
@@ -1277,7 +1277,7 @@ public static function getMenu($menuName, $pid = NULL) {
                 "NIH Reporting Tables 5 &amp; 8" => self::link("reporting/index.php"),
                 "Upload Prior NIH Reporting Tables" => self::link("reporting/upload_react/run/index.php"),
                 "List of Scholar Names" => self::link("/tablesAndLists/summaryNames.php"),
-                "K2R Conversion Calculator" => self::link("/k2r/index.php"),
+                "Conversion Calculator" => self::link("/k2r/index.php"),
                 "Kaplan-Meier Conversion Success Curve" => self::link("/charts/kaplanMeierCurve.php"),
                 "Configure Application" => self::link("/config.php"),
                 "Configure Summaries" => self::link("/config.php")."&order",