Merge pull request #2058 from department-of-veterans-affairs/remove-r…

…edundant-argument Leaf 3891 - Remove unused empUID argument
department-of-veterans-affairs · Aug 2, 2023 · 323d6fb · 323d6fb
2 parents c7737d5 + 0981a36
commit 323d6fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/LEAF_Nexus/api/controllers/EmployeeController.php b/LEAF_Nexus/api/controllers/EmployeeController.php
@@ -68,7 +68,7 @@ public function post($act)
             return print_r($args, true) . print_r($_GET, true);
         });
 
-
+        // Deprecated
         $this->index['POST']->register('employee/refresh/[text]/[digit]', function ($args) use ($employee, $national_db) {
             if (!$national_db) {
                 $return_value = $employee->refresh($args[0]);
@@ -84,6 +84,21 @@ public function post($act)
             return json_encode($return_value);
         });
 
+        $this->index['POST']->register('employee/refresh/[text]', function ($args) use ($employee, $national_db) {
+            if (!$national_db) {
+                $return_value = $employee->refresh($args[0]);
+            } else {
+                $return_value = array(
+                    'status' => array(
+                        'code' => 4,
+                        'message' => 'You can\'t update the national orgchart'
+                    )
+                );
+            }
+
+            return json_encode($return_value);
+        });
+
         $this->index['POST']->register('employee/refresh/batch', function ($args) use ($employee, $national_db) {
             if (!$national_db) {
                 $return_value = $employee->refreshBatch();

diff --git a/LEAF_Nexus/templates/view_employee.tpl b/LEAF_Nexus/templates/view_employee.tpl
@@ -1,7 +1,7 @@
 <div id="toolbar" class="toolbar_right toolbar noprint">
     <div id="tools"><h1>Tools</h1>
     <!--{if $is_admin == true}-->
-        <div onclick="refreshEmp('<!--{$summary.employee.userName|escape:"quotes"}-->', '<!--{$empUID}-->');"><img src="dynicons/?img=system-software-update.svg&w=32" style="vertical-align: middle" alt="Refresh Employee" title="Refresh Employee" /> Refresh Employee</div>
+        <div onclick="refreshEmp('<!--{$summary.employee.userName|escape:"quotes"}-->');"><img src="dynicons/?img=system-software-update.svg&w=32" style="vertical-align: middle" alt="Refresh Employee" title="Refresh Employee" /> Refresh Employee</div>
         <br />
       <!--{/if}-->
         <div onclick="assignBackup();"><img src="dynicons/?img=gnome-system-users.svg&amp;w=32" style="vertical-align: middle" alt="Set Backup" title="Set Backup" /> Assign Backup</div>
@@ -80,12 +80,12 @@
 <!--{include file="site_elements/genericJS_toolbarAlignment.tpl"}-->
 
 
-function refreshEmp(userName, empUID) {
+function refreshEmp(userName) {
     var CSRFToken = '<!--{$CSRFToken}-->';
 
     $.ajax({
         type: 'POST',
-        url: "./api/employee/refresh/_" + userName + "/" + empUID,
+        url: "./api/employee/refresh/_" + userName,
         dataType: "json",
         data: {CSRFToken: CSRFToken},
         success: function(res) {