Skip to content

Update 1.0.19 #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 28, 2024
Merged

Update 1.0.19 #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6925a1b
fix: Allow Team Leaders to edit members' information
nalves599 Jan 24, 2024
0fae7ed
fix: Change permissions in backend to edit members
PMax5 Jan 31, 2024
1bd6988
Merge pull request #424 from sinfo/423-allow-team-leaders-to-edit-mem…
PMax5 Jan 31, 2024
b8d1084
fix: expose speaker bio to public
nalves599 Mar 9, 2024
f8b6bf4
Merge pull request #425 from sinfo/fix-public-data
PMax5 Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions backend/src/models/speaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ type SpeakerPublic struct {
// Title of the speaker (CEO @ HugeCorportation, for example).
Title string `json:"title" bson:"title"`

// Bio of the speaker. Careful, this will be visible on our website!
Bio string `json:"bio" bson:"bio"`

Images SpeakerImagesPublic `json:"imgs" bson:"imgs"`
Participations []SpeakerParticipationPublic `json:"participation" bson:"participations"`
}
1 change: 1 addition & 0 deletions backend/src/mongodb/speaker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func speakerToPublic(speaker models.Speaker, eventID *int) (*models.SpeakerPubli
public := models.SpeakerPublic{
ID: speaker.ID,
Name: speaker.Name,
Bio: speaker.Bio,
Title: speaker.Title,
Images: models.SpeakerImagesPublic{
Speaker: speaker.Images.Speaker,
Expand Down
4 changes: 2 additions & 2 deletions backend/src/router/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@ func InitializeRouter() {
memberRouter.HandleFunc("/{id}", authMember(getMember)).Methods("GET")
memberRouter.HandleFunc("/{id}/role", authMember(getMemberRole)).Methods("GET")
memberRouter.HandleFunc("/{id}/participations", authMember(getMembersParticipations)).Methods("GET")
memberRouter.HandleFunc("/{id}", authAdmin(updateMember)).Methods("PUT")
memberRouter.HandleFunc("/{id}", authTeamLeader(updateMember)).Methods("PUT")
memberRouter.HandleFunc("/{id}", authAdmin(deleteMember)).Methods("DELETE")
memberRouter.HandleFunc("/{id}/image", authCoordinator(setMemberImage)).Methods("POST")
memberRouter.HandleFunc("/{id}/image", authTeamLeader(setMemberImage)).Methods("POST")

// item handlers
itemRouter := r.PathPrefix("/items").Subrouter()
Expand Down
2 changes: 1 addition & 1 deletion backend/static/swagger.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions backend/swagger/models/public-speaker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"title": {
"type": "string"
},
"bio": {
"type": "string"
},
"imgs": {
"type": "object",
"properties": {
Expand Down
14 changes: 7 additions & 7 deletions frontend/lib/routes/members_teams/member/EditMemberForm.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ class _EditMemberFormState extends State<EditMemberForm> {

Member me = Provider.of<Member?>(context, listen: false)!;
Member? m;
var role = Provider.of<AuthService>(context, listen: false).role;
var role = await Provider.of<AuthService>(context, listen: false).role;

if (role == Role.ADMIN || role == Role.COORDINATOR) {
if (role == Role.ADMIN || role == Role.COORDINATOR || role == Role.TEAMLEADER) {
m = await _memberService.updateMember(
id: widget.member.id, name: name, istid: istId);
} else {
Expand Down Expand Up @@ -106,15 +106,15 @@ class _EditMemberFormState extends State<EditMemberForm> {
builder: (context, snapshot) {
if (snapshot.hasData) {
Role role = snapshot.data as Role;
var adminOrCoord = role == Role.ADMIN || role == Role.COORDINATOR;
var adminOrCoordOrTeamLeader = role == Role.ADMIN || role == Role.COORDINATOR || role == Role.TEAMLEADER;
return Form(
key: _formKey,
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: TextFormField(
readOnly: !adminOrCoord,
readOnly: !adminOrCoordOrTeamLeader,
controller: _nameController,
validator: (value) {
if (value == null || value.isEmpty) {
Expand All @@ -125,14 +125,14 @@ class _EditMemberFormState extends State<EditMemberForm> {
decoration: InputDecoration(
icon: const Icon(Icons.person),
labelText: "Name *",
border: adminOrCoord ? null : InputBorder.none,
border: adminOrCoordOrTeamLeader ? null : InputBorder.none,
),
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: TextFormField(
readOnly: !adminOrCoord,
readOnly: !adminOrCoordOrTeamLeader,
controller: _istIdController,
validator: (value) {
if (value == null || value.isEmpty) {
Expand All @@ -144,7 +144,7 @@ class _EditMemberFormState extends State<EditMemberForm> {
decoration: InputDecoration(
icon: const Icon(Icons.school),
labelText: "IstId *",
border: adminOrCoord ? null : InputBorder.none,
border: adminOrCoordOrTeamLeader ? null : InputBorder.none,
),
),
),
Expand Down