Merge branch 'master' into next

Author: potts99

apps/client/pages/ticket/[id].tsx

@@ -373,6 +373,34 @@ export default function Ticket() {
                       >
                         save
                       </Button>
+                    {user.isAdmin && (
+                      <button
+                        type="button"
+                        onClick={() => hide(!data.ticket.hidden)}
+                        className="inline-flex justify-center items-center gap-x-1.5 rounded-md bg-white px-5 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
+                      >
+                        {data.ticket.hidden ? "Show Global" : "Hide Ticket"}
+                      </button>
+                    )}
+                    {!edit ? (
+                      <button
+                        type="button"
+                        onClick={() => setEdit(true)}
+                        className="inline-flex justify-center items-center gap-x-1.5 rounded-md bg-white px-5 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
+                      >
+                        {t("edit-btn")}
+                      </button>
+                    ) : (
+                      <button
+                        type="button"
+                        onClick={() => {
+                          update();
+                          setEdit(false);
+                        }}
+                        className="inline-flex justify-center gap-x-1.5 rounded-md bg-white px-5 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50"
+                      >
+                        {t("save")}
+                      </button>
                     )}
                   </div>
                 </div>
@@ -431,7 +459,6 @@ export default function Ticket() {
                                     : n
                                     ? n.name
                                     : t("select_new_user")}
-                                </span>
                               </Listbox.Button>
 
                               <Transition