teach/atsebay.t
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: teach:87d60c5fd503852b7702338047991410bbcfd04c
Branches Tags
teach:master
teach:f/nb_participants_in_results
teach:f/picture-from-oidc
teach:svelte
..
compare: teach:a5105979ccc49349a6159b6d87c96d931a17307f
Branches Tags
teach:master
teach:f/nb_participants_in_results
teach:f/picture-from-oidc
teach:svelte

No commits in common. "87d60c5fd503852b7702338047991410bbcfd04c" and "a5105979ccc49349a6159b6d87c96d931a17307f" have entirely different histories.
87d60c5fd5 ... a5105979cc

4 changed files with 9 additions and 43 deletions
Show Stats Expand all files Collapse all files

15
surveys.go
View File

@ -52,7 +52,6 @@ func declareAPISurveysRoutes(router *gin.RouterGroup) {
surveysRoutes := router.Group("/surveys/:sid")
surveysRoutes.Use(surveyHandler)
surveysRoutes.Use(surveyUserAccessHandler)
surveysRoutes.GET("", func(c *gin.Context) {
u := c.MustGet("LoggedUser").(*User)
@ -199,20 +198,6 @@ func surveyHandler(c *gin.Context) {
}
}
func surveyUserAccessHandler(c *gin.Context) {
u := c.MustGet("LoggedUser").(*User)
w := c.MustGet("survey").(*Survey)
if u.IsAdmin {
c.Next()
} else if w.Shown && (w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",")) {
c.Next()
} else {
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Survey not found."})
return
}
}
type Survey struct {
Id int64 `json:"id"`
Title string `json:"title"`

15
ui/src/components/WorkRepository.svelte
View File

@ -82,20 +82,17 @@
{#each repos as repo (repo.id)}
<div class="{className} card">
<div class="card-body d-flex justify-content-between">
<div class="d-flex flex-column justify-content-center pe-3">
<div class="d-flex flex-column justify-content-center">
<div>
<div class="row">
<label for={repo.id + "url"} class="col-sm-4 col-form-label">Dépôt lié&nbsp;:</label>
<div class="col-sm-8">
<label for={repo.id + "url"} class="col-sm-6 col-form-label">Dépôt lié&nbsp;:</label>
<div class="col-sm-6">
<input type="text" class="form-control form-control-sm" style="font-family: monospace" disabled id={repo.id + "url"} value={repo.uri}>
</div>
</div>
<p class="mt-2 mb-0 pe-1">
Vous pouvez ajouter un <span class="fst-italic">webhook</span> sur les <span class="fst-italic"><strong>Tag push events</strong></span> afin d'automatiser la récupération de votre travail. Dans les paramètres de votre dépôt sur GitLab, faite pointer un webhook sur <code>https://lessons.nemunai.re/api/callbacks/trigger.json</code> avec le secret ci-dessous.
</p>
<div class="row">
<label for={repo.id + "secret"} class="col-sm-4 col-form-label">Webhook Secret token&nbsp;:</label>
<div class="col-sm-8">
<label for={repo.id + "secret"} class="col-sm-6 col-form-label">Webhook Secret token (à indiquer dans GitLab)&nbsp;:</label>
<div class="col-sm-6">
<div class="input-group">
<input type={repo.show_secret?"text":"password"} class="form-control form-control-sm" disabled id={repo.id + "secret"} value={repo.secret}>
<button class="btn btn-sm btn-outline-info" on:click={() => { repo.show_secret = !repo.show_secret}}>
@ -178,7 +175,7 @@
<button
type="submit"
class="mt-2 btn btn-primary"
disable={submitInProgress || readonly || !repo_used || !repo_used.uri}
disable={submitInProgress || readonly}
>
Utiliser ce dépôt
</button>

3
ui/src/routes/works/[wid]/index.svelte
View File

@ -145,7 +145,8 @@
<ul>
<li>être dans l'espace de nom de votre utilisateur (à la fin de la liste des <span class="fst-italic">namespaces</span>),</li>
<li>avoir la visibilité «&nbsp;Privé&nbsp;»,</li>
<li>avoir invité <a href="https://gitlab.cri.epita.fr/nemunaire" target="_blank" style="font-family: monospace">nemunaire</a> avec le rôle <span class="fst-italic">Reporter</span> une fois le dépôt créé.</li>
<li>avoir invité <a href="https://gitlab.cri.epita.fr/nemunaire" target="_blank" style="font-family: monospace">nemunaire</a> avec le rôle <span class="fst-italic">Reporter</span> une fois le dépôt créé,</li>
<li>avoir configuré un <span class="fst-italic">webhook <strong>Tag push events</strong></span> pointant sur <code>https://lessons.nemunai.re/api/callbacks/trigger.json</code> avec le secret donné.</li>
</ul>
{#if w.tag}

19
works.go
View File

@ -190,7 +190,6 @@ func declareAPIAdminWorksRoutes(router *gin.RouterGroup) {
func declareAPIAuthWorksRoutes(router *gin.RouterGroup) {
worksRoutes := router.Group("/works/:wid")
worksRoutes.Use(workHandler)
worksRoutes.Use(workUserAccessHandler)
worksRoutes.GET("", func(c *gin.Context) {
u := c.MustGet("LoggedUser").(*User)
@ -210,9 +209,7 @@ func declareAPIAuthWorksRoutes(router *gin.RouterGroup) {
u := c.MustGet("LoggedUser").(*User)
w := c.MustGet("work").(*Work)
if !u.IsAdmin && !w.Corrected {
c.AbortWithStatusJSON(http.StatusForbidden, gin.H{"errmsg": "Permission denied"})
} else if g, err := u.GetMyWorkGrade(w); err != nil && errors.Is(err, sql.ErrNoRows) {
if g, err := u.GetMyWorkGrade(w); err != nil && errors.Is(err, sql.ErrNoRows) {
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Aucune note n'a été attribuée pour ce travail. Avez-vous rendu ce travail ?"})
} else if err != nil {
log.Printf("Unable to GetMyWorkGrade(uid=%d;wid=%d): %s", u.Id, w.Id, err.Error())
@ -239,20 +236,6 @@ func workHandler(c *gin.Context) {
}
}
func workUserAccessHandler(c *gin.Context) {
u := c.MustGet("LoggedUser").(*User)
w := c.MustGet("work").(*Work)
if u.IsAdmin {
c.Next()
} else if w.Shown && (w.Group == "" || strings.Contains(u.Groups, ","+w.Group+",")) {
c.Next()
} else {
c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"errmsg": "Work not found."})
return
}
}
type OneWork struct {
Kind string `json:"kind"`
Id int64 `json:"id"`