Merge pull request #426 from sinfo/staging

Update 1.0.19

Author: PMax5

backend/src/models/speaker.go

@@ -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"`
 }

backend/src/mongodb/speaker.go

@@ -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,

backend/src/router/init.go

@@ -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()

backend/static/swagger.json

@@ -10,6 +10,9 @@
         "title": {
             "type": "string"
         },
+        "bio": {
+            "type": "string"
+        },
         "imgs": {
             "type": "object",
             "properties": {

backend/swagger/models/public-speaker.json

@@ -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 {
@@ -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) {
@@ -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) {
@@ -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,
                     ),
                   ),
                 ),