Improve api handling

Leantime · Aug 29, 2024 · a0cbf62 · a0cbf62
1 parent bc041b8
commit a0cbf62
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/app/Core/Http/ApiRequest.php b/app/Core/Http/ApiRequest.php
@@ -72,7 +72,7 @@ public function getAuthorizationHeader(): string
      */
     public function getAPIKey(): string
     {
-        return trim($this->headers->get('x-api-key') ?? '');
+        return $this->headers->get('x-api-key');
     }
 
     /**

diff --git a/app/Domain/Api/Templates/apiKey.tpl.php b/app/Domain/Api/Templates/apiKey.tpl.php
@@ -78,17 +78,23 @@
                     <?php
                     $currentClient = '';
                     $i = 0;
+                    $containerOpen = false;
                     foreach ($tpl->get('allProjects') as $row) {
+
                         if ($currentClient != $row['clientName']) {
-                            if ($i > 0) {
+                            if ($i > 0 && $containerOpen) {
                                 echo"</div>";
+                                $containerOpen = false;
                             }
+
                             echo "<h3 id='accordion_link_" . $i . "'>
-                        <a href='#' onclick='accordionToggle(" . $i . ");' id='accordion_toggle_" . $i . "'><i class='fa fa-angle-down'></i> " . $tpl->escape($row['clientName']) . "</a>
-                        </h3>
-                        <div id='accordion_" . $i . "' class='simpleAccordionContainer'>";
-                            $currentClient = $row['clientName'];
+                            <a href='#' onclick='accordionToggle(" . $i . ");' id='accordion_toggle_" . $i . "'><i class='fa fa-angle-down'></i> " . $tpl->escape($row['clientName']) . "</a>
+                            </h3>
+                            <div id='accordion_" . $i . "' class='simpleAccordionContainer'>";
+                                $currentClient = $row['clientName'];
+                                $containerOpen = true;
                         } ?>
+
                         <div class="item">
                             <input type="checkbox" name="projects[]" id='project_<?php echo $row['id'] ?>' value="<?php echo $row['id'] ?>"
                                 <?php if (is_array($projects) === true && in_array($row['id'], $projects) === true) {
@@ -97,7 +103,7 @@
                             /><label for="project_<?php echo $row['id'] ?>"><?php $tpl->e($row['name']); ?></label>
                             <div class="clearall"></div>
                         </div>
-                                            <?php $i++; ?>
+                        <?php $i++; ?>
                     <?php } ?>
 
 

diff --git a/app/Domain/Api/Templates/newAPIKey.tpl.php b/app/Domain/Api/Templates/newAPIKey.tpl.php
@@ -80,16 +80,19 @@
                     <?php
                     $currentClient = '';
                     $i = 0;
+                    $containerOpen = false;
                     foreach ($tpl->get('allProjects') as $row) {
                         if ($currentClient != $row['clientName']) {
-                            if ($i > 0) {
+                            if ($i > 0 && $containerOpen) {
                                 echo"</div>";
+                                $containerOpen = false;
                             }
                             echo "<h3 id='accordion_link_" . $i . "'>
                         <a href='#' onclick='accordionToggle(" . $i . ");' id='accordion_toggle_" . $i . "'><i class='fa fa-angle-down'></i> " . $tpl->escape($row['clientName']) . "</a>
                         </h3>
                         <div id='accordion_" . $i . "' class='simpleAccordionContainer'>";
                             $currentClient = $row['clientName'];
+                            $containerOpen = true;
                         } ?>
                         <div class="item">
                             <input type="checkbox" name="projects[]" id='project_<?php echo $row['id'] ?>' value="<?php echo $row['id'] ?>"