Adding protected status archive back

Leantime · Aug 29, 2024 · ef7720d · ef7720d
1 parent 3940627
commit ef7720d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/app/Domain/Projects/Templates/showProject.tpl.php b/app/Domain/Projects/Templates/showProject.tpl.php
@@ -304,7 +304,9 @@
                         <?php foreach ($tpl->get('todoStatus') as $key => $ticketStatus) { ?>
                             <li>
                                 <div class="ticketBox">
-                                    <div class="row statusList" id="todostatus-<?=$key?>">
+
+                                    <div class="row statusList" id="todostatus-<?=$key ?>">
+
                                         <input type="hidden" name="labelKeys[]" id="labelKey-<?=$key?>" class='labelKey' value="<?=$key?>"/>
                                         <div class="sortHandle">
                                             <br />
@@ -315,8 +317,9 @@
                                             <input type="text" name="labelSort-<?=$key?>" class="sorter" id="labelSort-<?=$key ?>" value="<?=$tpl->escape($ticketStatus['sortKey']);?>" style="width:50px;"/>
                                         </div>
                                         <div class="col-md-2">
+
                                             <label><?=$tpl->__("label.label") ?></label>
-                                            <input type="text" name="label-<?=$key?>" id="label-<?=$key?>" value="<?=$tpl->escape($ticketStatus['name']);?>" />
+                                            <input type="text" name="label-<?=$key?>" <?=$key==-1?'readonly':''?> id="label-<?=$key?>" value="<?=$tpl->escape($ticketStatus['name']);?>" />
 
                                         </div>
                                         <div class="col-md-2">
@@ -354,9 +357,15 @@
                                         </div>
                                         <div class="remove">
                                             <br />
-                                            <a href="javascript:void(0);" onclick="leantime.projectsController.removeStatus(<?=$key?>)" class="delete"><span class="fa fa-trash"></span></a>
+                                            <?php if($key != -1){ ?>
+                                                <a href="javascript:void(0);" onclick="leantime.projectsController.removeStatus(<?=$key?>)" class="delete"><span class="fa fa-trash"></span></a>
+                                            <?php } ?>
                                         </div>
                                     </div>
+
+                                    <?php if ($key == -1) { ?>
+                                        <em>* the archive status is protected cannot be renamed or removed.</em>
+                                    <?php } ?>
                                 </div>
                             </li>
 

diff --git a/app/Domain/Tickets/Repositories/Tickets.php b/app/Domain/Tickets/Repositories/Tickets.php
@@ -187,8 +187,13 @@ public function getStateLabels($projectId = null): array
 
             //Override the state values that are in the db
             if ($values !== false) {
+
                 $statusList = array();
 
+                //Archive is required and protected.
+                //Adding the original version back in case folks removed it
+                $statusList[-1] = $this->statusListSeed[-1];
+
                 foreach (unserialize($values['value']) as $key => $status) {
                     if (is_int($key)) {
                         //Backwards Compatibility with existing labels in db
@@ -197,7 +202,7 @@ public function getStateLabels($projectId = null): array
                         if (!is_array($status)) {
                             $statusList[$key] = $this->statusListSeed[$key];
 
-                            if (is_array($statusList[$key]) && isset($statusList[$key]["name"])) {
+                            if (is_array($statusList[$key]) && isset($statusList[$key]["name"]) && $key !== -1) {
                                 $statusList[$key]["name"] = $status;
                             }
                         } else {