From 67e1323583137af0da9b1fb212ac3f495e83df4c Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Fri, 4 Nov 2022 13:26:16 -0600
Subject: [PATCH] Infolog: Fix config validation about missing options, make
 cancel button not validate

---
 infolog/inc/class.infolog_ui.inc.php | 16 +++++++++-------
 infolog/templates/default/config.xet |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 0f0c9e1380..2a775645fe 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -2479,17 +2479,19 @@ class infolog_ui
 	public function admin($content = array())
 	{
 		$fields = array(
-			'info_cat'      => 'Category',
-			'info_from'     => 'Contact',
-			'info_subject'  => 'Subject',
-			'info_des'      => 'Description',
-			'link_to'       => 'Links',
-			'info_priority' => 'Priority',
-			'info_location' => 'Location',
+			'info_status'       => 'Status',
+			'info_cat'          => 'Category',
+			'info_from'         => 'Contact',
+			'info_subject'      => 'Subject',
+			'info_des'          => 'Description',
+			'link_to'           => 'Links',
+			'info_priority'     => 'Priority',
+			'info_location'     => 'Location',
 			'info_planned_time' => 'Planned time',
 			'info_used_time'    => 'Used time',
 		);
 		$excludefields = array(
+			'info_id'		=> 'ID',
 			'info_cat'      => 'Category',
 			'info_from'     => 'Contact',
 			'info_subject'  => 'Subject',
diff --git a/infolog/templates/default/config.xet b/infolog/templates/default/config.xet
index a756ad20d5..135aeb8a7c 100644
--- a/infolog/templates/default/config.xet
+++ b/infolog/templates/default/config.xet
@@ -117,7 +117,7 @@
             <hbox class="dialogFooterToolbar">
                 <button statustext="Save the changes made" label="Save" id="save"/>
                 <button statustext="apply the changes" label="Apply" id="apply"/>
-                <button statustext="Exit without saving" label="Cancel" id="cancel"/>
+                <button statustext="Exit without saving" label="Cancel" id="cancel" noValidation="true"/>
             </hbox>
         </vbox>
         <styles>select {