New option to disallow team creation: join only
This commit is contained in:
parent
5d3ef96f3f
commit
64b9e9a251
6 changed files with 53 additions and 30 deletions
|
@ -178,6 +178,7 @@ func main() {
|
|||
WChoiceCurCoefficient: 1,
|
||||
AllowRegistration: false,
|
||||
CanJoinTeam: false,
|
||||
DenyTeamCreation: false,
|
||||
DenyNameChange: false,
|
||||
AcceptNewIssue: true,
|
||||
EnableResolutionRoute: false,
|
||||
|
|
|
@ -129,6 +129,13 @@
|
|||
</label>
|
||||
</div>
|
||||
|
||||
<div class="form-check">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input class="custom-control-input" type="checkbox" ng-model="config.denyTeamCreation" ng-disabled="!config.allowRegistration && !config.canJoinTeam">
|
||||
<span class="custom-control-label">Interdire la création de nouvelles équipes</span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="form-check">
|
||||
<label class="custom-control custom-checkbox">
|
||||
<input class="custom-control-input" type="checkbox" ng-model="config.denyNameChange">
|
||||
|
|
|
@ -70,6 +70,7 @@ var skipInitialGeneration = false
|
|||
func reloadSettings(config settings.FICSettings) {
|
||||
allowRegistration = config.AllowRegistration
|
||||
canJoinTeam = config.CanJoinTeam
|
||||
denyTeamCreation = config.DenyTeamCreation
|
||||
fic.HintCoefficient = config.HintCurCoefficient
|
||||
fic.WChoiceCoefficient = config.WChoiceCurCoefficient
|
||||
fic.ExerciceCurrentCoefficient = config.ExerciceCurCoefficient
|
||||
|
|
|
@ -18,6 +18,7 @@ import (
|
|||
var (
|
||||
allowRegistration = false
|
||||
canJoinTeam = false
|
||||
denyTeamCreation = false
|
||||
)
|
||||
|
||||
type uTeamRegistration struct {
|
||||
|
@ -78,6 +79,8 @@ func treatRegistration(pathname string, team_id string) {
|
|||
log.Printf("%s [WRN] %s\n", id, err)
|
||||
}
|
||||
}
|
||||
} else if denyTeamCreation {
|
||||
log.Printf("%s [ERR] Registration received, whereas team creation denied. Skipped.\n", id)
|
||||
} else if validTeamName(nTeam.TeamName) {
|
||||
if team, err := fic.CreateTeam(nTeam.TeamName, uint32(rand.Int31n(16581376))); err != nil {
|
||||
log.Printf("%s [ERR] Unable to register new team %s: %s\n", id, nTeam.TeamName, err)
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="jumbotron niceborder" style="text-indent: 1em" ng-if="settings.allowRegistration">
|
||||
<div class="jumbotron niceborder" style="text-indent: 1em" ng-if="settings.allowRegistration && !settings.denyTeamCreation">
|
||||
<p>
|
||||
<strong>Félicitations ! vous êtes maintenant authentifié auprès de
|
||||
<strong>Félicitations ! vous êtes maintenant authentifié·e auprès de
|
||||
notre serveur !</strong>
|
||||
</p>
|
||||
<p>
|
||||
|
@ -76,9 +76,18 @@
|
|||
</div>
|
||||
|
||||
<div class="jumbotron niceborder" style="text-indent: 1em" ng-if="settings.canJoinTeam">
|
||||
<p>
|
||||
<p ng-if="settings.denyTeamCreation">
|
||||
<strong>Félicitations ! vous êtes maintenant authentifié·e auprès de
|
||||
notre serveur !</strong>
|
||||
</p>
|
||||
<p ng-if="!settings.denyTeamCreation">
|
||||
Si votre équipe est déjà créée, rejoignez-là !
|
||||
</p>
|
||||
<p ng-if="settings.denyTeamCreation">
|
||||
Vous n'êtes pas encore enregistré·e sur notre serveur. Afin de
|
||||
pouvoir participer au challenge, nous vous remercions de bien vouloir
|
||||
rejoindre votre équipe :
|
||||
</p>
|
||||
<form ng-submit="jsubmit()">
|
||||
|
||||
<div class="row">
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
"os"
|
||||
"os/signal"
|
||||
"path"
|
||||
"time"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"gopkg.in/fsnotify.v1"
|
||||
)
|
||||
|
@ -53,6 +53,8 @@ type FICSettings struct {
|
|||
AllowRegistration bool `json:"allowRegistration"`
|
||||
// CanJoinTeam permits unregistered account to join an already existing team.
|
||||
CanJoinTeam bool `json:"canJoinTeam"`
|
||||
// DenyTeamCreation forces unregistered account to join a team, it's not possible to create a new team.
|
||||
DenyTeamCreation bool `json:"denyTeamCreation"`
|
||||
// DenyNameChange disallow Team to change their name.
|
||||
DenyNameChange bool `json:"denyNameChange"`
|
||||
// AcceptNewIssue enables the reporting system.
|
||||
|
|
Reference in a new issue