-
Notifications
You must be signed in to change notification settings - Fork 2
Enhances Team Admin member role view. #1376
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.
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
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9b0a980
Enhances Team Admin member role view.
jSylvestre a6c414d
rebuild
jSylvestre cf194dd
Updates the Azure Pipelines VM image
jSylvestre cd07f59
Updates CI pipeline and Node version
jSylvestre 14f00f8
update readme
jSylvestre 5194d05
Updates npm engine version
jSylvestre File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,7 +94,7 @@ | |
| } | ||
| }, | ||
| "engines": { | ||
| "npm": ">=9.5.1", | ||
| "node": ">=18.16.0" | ||
| "npm": ">=10.0.0", | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the one AI and google appear to say is the correct one. |
||
| "node": ">=20.0.0" | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,80 @@ | ||
| @model Keas.Mvc.Models.TeamAdminMembersListModel | ||
|
|
||
| @{ | ||
| ViewData["Title"] = "Role Assigned Members "; | ||
| } | ||
| <div class="card"> | ||
| <div class="card-header-primary"> | ||
| <div class="card-head row justify-content-between"> | ||
| <h2>Members with roles in @Model.Team.Name</h2> | ||
| <a class="btn btn-link" asp-action="AddMemberRole"><i class="fas fa-plus fa-xs"/></i> Add new Admin Role.</a> | ||
| </div> | ||
| ViewData["Title"] = "Role Assigned Members "; | ||
| } | ||
| <div class="card"> | ||
| <div class="card-header-primary"> | ||
| <div class="card-head row justify-content-between"> | ||
| <h2>Members with roles in @Model.Team.Name</h2> | ||
| <a class="btn btn-link" asp-action="AddMemberRole"><i class="fas fa-plus fa-xs" /></i> Add new Admin Role.</a> | ||
| </div> | ||
| <div class="card-content"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th> | ||
| Name | ||
| </th> | ||
| <th> | ||
| </th> | ||
| <th> | ||
| Roles | ||
| </th> | ||
| <th> | ||
| </div> | ||
| <div class="card-content"> | ||
| <table class="table"> | ||
| <thead> | ||
| <tr> | ||
| <th> | ||
| Name | ||
| </th> | ||
| <th> | ||
| </th> | ||
| <th> | ||
| Roles | ||
| </th> | ||
| <th> | ||
|
|
||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| @foreach (var item in Model.UserRoles) { | ||
| <tr> | ||
| <td> | ||
| @item.User.LastName, @item.User.FirstName | ||
| </td> | ||
| <td>@Html.DisplayFor(a => item.User.Email)</td> | ||
| <td> | ||
| @item.RolesList | ||
| </td> | ||
| <td> | ||
| @Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id}) | ||
| </td> | ||
| </th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| @foreach (var item in Model.UserRoles) | ||
| { | ||
| <tr> | ||
| <td> | ||
| @item.User.LastName, @item.User.FirstName | ||
| </td> | ||
| <td>@Html.DisplayFor(a => item.User.Email)</td> | ||
| <td> | ||
| @item.RolesList | ||
| </td> | ||
| <td> | ||
| @Html.ActionLink("Remove Role(s)", "RemoveRoles", new { userId = item.User.Id }) | ||
| </td> | ||
|
|
||
| </tr> | ||
| } | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| </tr> | ||
| } | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
| @section Styles | ||
| { | ||
| @{ | ||
| await Html.RenderPartialAsync("_ReportStylePartial"); | ||
| } | ||
| } | ||
|
|
||
| @section Scripts | ||
| { | ||
| @{ | ||
| await Html.RenderPartialAsync("_ReportScriptsPartial"); | ||
| } | ||
| <script type="text/javascript"> | ||
| $(function () { | ||
| $(".table").dataTable({ | ||
| "columnDefs": [ | ||
| { | ||
| targets: -1, | ||
| className: 'dt-body-right', | ||
| sortable: false, | ||
| }, | ||
|
|
||
| ] | ||
| }); | ||
| }); | ||
| </script> | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes in npm and node usually go together. Should probably update the npm version here to whatever comes with node 20.0.0.