bouzoure/pop-camarades
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate to PostgreSQL and fix related issues

Browse source
This commit is contained in:
William Bouzourène 2025-05-12 21:10:40 +02:00
parent 0b8fbea6c3
commit a89a9776c3
Signed by: bouzoure
SSH key fingerprint: SHA256:19MbXpLua4rUtk8tunMesD8KUKb91LXLHg8E/qTooww
17 changed files with 176 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

24
controllers/members.go
View file

@ -84,7 +84,7 @@ func Members(c *fiber.Ctx) error {
params.PersonType = "members"
var sections []models.Section
db.Order("name collate nocase asc").Find(&sections, "contains_members = ? AND id IN ?", true, allowedSections)
db.Order("name asc").Find(&sections, "contains_members = ? AND id IN ?", true, allowedSections)
params.AllowedSections = allowedSections
// Security for active contacts
@ -171,7 +171,7 @@ func MembersExport(c *fiber.Ctx) error {
params.PersonType = "members"
var sections []models.Section
db.Order("name collate nocase asc").Find(&sections, "contains_members = ? AND id IN ?", true, allowedSections)
db.Order("name asc").Find(&sections, "contains_members = ? AND id IN ?", true, allowedSections)
params.AllowedSections = allowedSections
// Security for active contacts
@ -338,7 +338,7 @@ func MemberShow(c *fiber.Ctx) error {
var person models.Person
result := db.Unscoped().Preload("Section").Find(
&person, "id = ? AND is_member", id, true,
&person, "id = ? AND is_member = ?", id, true,
)
if result.Error != nil {
@ -431,7 +431,7 @@ func MemberAdd(c *fiber.Ctx) error {
}
var sections []models.Section
db.Order("name collate nocase asc").Find(
db.Order("name asc").Find(
&sections,
"contains_members = ?",
true,
@ -526,7 +526,7 @@ func MemberAdd(c *fiber.Ctx) error {
}
for _, field := range fields {
if field.List.Multi {
if field.List != nil && field.List.Multi {
for _, listItem := range field.List.ListItems {
key := fmt.Sprintf("field-%d-%d", field.ID, listItem.ID)
value := c.FormValue(key)
@ -535,7 +535,7 @@ func MemberAdd(c *fiber.Ctx) error {
var fieldValue models.FieldValue
fieldValue.FieldID = field.ID
fieldValue.PersonID = person.ID
fieldValue.ListItemID = listItem.ID
fieldValue.ListItemID = &listItem.ID
db.Create(&fieldValue)
}
}
@ -609,7 +609,8 @@ func MemberAdd(c *fiber.Ctx) error {
var fieldValue models.FieldValue
fieldValue.FieldID = field.ID
fieldValue.PersonID = person.ID
fieldValue.ListItemID = uint(valueInt)
valueUint := uint(valueInt)
fieldValue.ListItemID = &valueUint
db.Create(&fieldValue)
}
}
@ -674,7 +675,7 @@ func MemberEdit(c *fiber.Ctx) error {
}
var sections []models.Section
db.Order("name collate nocase asc").Find(
db.Order("name asc").Find(
&sections,
"contains_members = ?",
true,
@ -775,7 +776,7 @@ func MemberEdit(c *fiber.Ctx) error {
field.ID,
)
if field.List.Multi {
if field.List != nil && field.List.Multi {
for _, listItem := range field.List.ListItems {
key := fmt.Sprintf("field-%d-%d", field.ID, listItem.ID)
value := c.FormValue(key)
@ -784,7 +785,7 @@ func MemberEdit(c *fiber.Ctx) error {
var fieldValue models.FieldValue
fieldValue.FieldID = field.ID
fieldValue.PersonID = person.ID
fieldValue.ListItemID = listItem.ID
fieldValue.ListItemID = &listItem.ID
db.Create(&fieldValue)
}
}
@ -858,7 +859,8 @@ func MemberEdit(c *fiber.Ctx) error {
var fieldValue models.FieldValue
fieldValue.FieldID = field.ID
fieldValue.PersonID = person.ID
fieldValue.ListItemID = uint(valueInt)
valueUint := uint(valueInt)
fieldValue.ListItemID = &valueUint
db.Create(&fieldValue)
}
}