fix: citizen info second back button and add audit log for delete

faction Signed-off-by: Alexander Trost <[email protected]>
fivenet-app · Oct 10, 2024 · 1b257c4 · 1b257c4
1 parent e180ce7
commit 1b257c4
Show file tree

Hide file tree

Showing 15 changed files with 584 additions and 148 deletions.
diff --git a/app/components/citizens/info/CitizenInfo.vue b/app/components/citizens/info/CitizenInfo.vue
@@ -217,7 +217,7 @@ const isOpen = ref(false);
         <UDashboardPanel v-if="user" v-model="isOpen" collapsible side="right" class="max-w-72 flex-1">
             <UDashboardNavbar>
                 <template #right>
-                    <UButton color="black" icon="i-mdi-arrow-back" to="/citizens">
+                    <UButton color="black" icon="i-mdi-arrow-back" to="/citizens" class="md:hidden">
                         {{ $t('common.back') }}
                     </UButton>
 

diff --git a/gen/go/proto/resources/common/cron/cron.go b/gen/go/proto/resources/common/cron/cron.go
@@ -0,0 +1,7 @@
+package cron
+
+func (x *Cronjob) Merge(in *Cronjob) *Cronjob {
+	// TODO
+
+	return x
+}
diff --git a/gen/go/proto/resources/common/cron/cron.pb.go b/gen/go/proto/resources/common/cron/cron.pb.go
diff --git a/gen/go/proto/resources/common/cron/cron.pb.validate.go b/gen/go/proto/resources/common/cron/cron.pb.validate.go