Skip to content

Commit

Permalink
Merge pull request #480 from rsiminel/new-user-groups
Browse files Browse the repository at this point in the history
Always select newly created groups
  • Loading branch information
mboudet authored Jul 12, 2024
2 parents 1576ca8 + c1ce1d7 commit 458bf5a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
## 1.4.30 (TBA)

* Added a `project.terms_and_conditions_hds` setting in the config:
If true:
If true:
"Ask Admin" button to submit project creation form became available after 'project name' and 'expiration date' are filled, 'project description' is at least 30 char and a checkbox appears and 'terms and conditions hds' should also be checked
If false:
"Ask Admin" button to submit project creation form became available after 'project name' and 'expiration date' are filled, 'project description' is at least 30 char, no consentment checkbox
* Added 'End date' to the project request page
"Ask Admin" button to submit project creation form became available after 'project name' and 'expiration date' are filled, 'project description' is at least 30 char, no consent checkbox
* Add 'End date' to the project request page
* Set 'description' as a required field in the project request page and set a minimal length of 30 char
* Added a link to user profile on admin panels -> projects pending table
* Added 'Extend' button for admins to extend active TPs
* Prevented retroactive TP reservations
* Added checks to user registration form, the user information update form and the TP reservation form
* Added back button from single project view
* Improved TP calendar readability
* Add a link to user profile on admin panels -> projects pending table
* Add 'Extend' button for admins to extend active TPs
* Add checks to user registration form, the user information update form and the TP reservation form
* Add back button from single project view
* Updated TP calendar to increase readability
* Fix newly created group selection bug

## 1.4.29

Expand Down
2 changes: 1 addition & 1 deletion manager2/src/app/user/user.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ <h4>Information</h4>
<div class="col-4 col-form-label"></div>
<div class="col-6">
<select [(ngModel)]="user.group" [ngModelOptions]="{standalone: true}" class="form-control">
<option *ngFor="let group of groups" [value]="group.name">{{group.new ? group.name + " (new group)" : group.name}}</option>
<option *ngFor="let group of groups" [ngValue]="group.name">{{group.new ? group.name + " (new group)" : group.name}}</option>
</select>
<div class="alert alert-success" *ngIf="grp_success_msg">{{grp_success_msg}}</div>
<div class="alert alert-danger" *ngIf="grp_err_msg">{{grp_err_msg}}</div>
Expand Down

0 comments on commit 458bf5a

Please sign in to comment.