Merge branch 'main' into develop

CampusDual · Dec 12, 2024 · 9b4b92d · 9b4b92d
2 parents 2453dd6 + 429642b
commit 9b4b92d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/cd2024bfs4g1-model/src/main/resources/db/migration/V15__create_student_roles.sql b/cd2024bfs4g1-model/src/main/resources/db/migration/V15__create_student_roles.sql
@@ -1,19 +1,31 @@
 
-CREATE TABLE public.tmenu(id varchar(100),attr VARCHAR(100),visible BOOLEAN,enabled BOOLEAN,id_rolename INTEGER)
+CREATE TABLE public.tmenu(id varchar(100),attr VARCHAR(100),visible BOOLEAN,enabled BOOLEAN,id_rolename INTEGER);
 INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
-    VALUES ('1', 'admin', true, true, 1),
-           ('2', 'admin', false, false, 2),
-           ('3', 'admin', false, false, 3),
-           ('4', 'bootcamps', true, true, 1),
-           ('5', 'bootcamps', true, true, 2),
-           ('6', 'bootcamps', false, false, 3),
-           ('7', 'students', true, true, 2),
-           ('8', 'students', false, false, 3),
-           ('9', 'home', false, false, 3),
-           ('10', 'students', true, true, 1),
-           ('11', 'personalinfo', true, true, 3),
-           ('12', 'personalinfo', false, false, 2),
-           ('13', 'personalinfo', false, false, 1);
+    VALUES ('1', 'admin', true, true, 1);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('2', 'admin', false, false, 2);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('3', 'admin', false, false, 3);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('4', 'bootcamps', true, true, 1);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('5', 'bootcamps', true, true, 2);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('6', 'bootcamps', false, false, 3);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('7', 'students', true, true, 2);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('8', 'students', false, false, 3);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('9', 'home', false, false, 3);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('10', 'students', true, true, 1);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('11', 'personalinfo', true, true, 3);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('12', 'personalinfo', false, false, 2);
+INSERT INTO public.tmenu (id, attr, visible, enabled, id_rolename)
+   VALUES ('13', 'personalinfo', false, false, 1);
 INSERT INTO public.tmenu (id,attr,visible,enabled,id_rolename)
 	VALUES ('14','config',true,true,1);
 INSERT INTO public.tmenu (id,attr,visible,enabled,id_rolename)

diff --git a/charts/cd2024bfs4g1/values-dev.yaml b/charts/cd2024bfs4g1/values-dev.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: IfNotPresent
   ## provided as basic setup. replace as needed
   repository: ghcr.io/campusdual/cd2024bfs4g1
-  version: deve8f6874
+  version: dev8788e4c
 imagePullSecrets: 
   - name: "github-ecr-cred" 
 nameOverride: ""

diff --git a/charts/cd2024bfs4g1/values.yaml b/charts/cd2024bfs4g1/values.yaml
@@ -6,7 +6,7 @@ image:
   pullPolicy: IfNotPresent
   ## provided as basic setup. replace as needed
   repository: ghcr.io/campusdual/cd2024bfs4g1
-  version: pro9abec46
+  version: pro67e4571
 imagePullSecrets: 
   - name: "github-ecr-cred" 
 nameOverride: ""