Issue #84 fix bug on Tourst_model.php get(), additional commenting to…

… explain why tour counts on get are needed in person edit.
generalludd · Apr 14, 2021 · 50611b2 · 50611b2
1 parent 0cb0ead
commit 50611b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/application/controllers/Person.php b/application/controllers/Person.php
@@ -202,6 +202,7 @@ function edit() {
 			"value",
 			"name",
 		], TRUE);
+		// we get the tour count because if a person has not been on any tours, they can be deleted, otherwise they can only be marked as inactive.
 		$this->load->model("tourist_model", "tourist");
 		$data["tour_count"] = count($this->tourist->get($id));
 		$data["target"] = "person/edit";

diff --git a/application/views/person/edit.php b/application/views/person/edit.php
@@ -67,7 +67,7 @@ class="button delete delete-action"
 								 data-controller="person"
 								 data-form="person-editor"
 								 title="This person has been on tours, they will be disabled instead of deleted"
-								 value="Delete"/>
+								 value="Disable"/>
 				<?php endif; ?>
 			<?php endif; ?>
 		</p>