Skip to content

Additional auth #6

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.

Sign up for GitHub

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

Open
GregorVolcanjk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Additional auth #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a8fd8a
Za vse entitete dolocil pravice
GregorVolcanjk Jan 8, 2022
cc447d0
Auth view popravek pri item customer distributor
GregorVolcanjk Jan 9, 2022
3512a92
Merge branch 'master' into additional-auth
GreTimotej Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions web/Controllers/CustomerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public async Task<IActionResult> Details(int? id)
}

// GET: Customer/Create
[Authorize(Roles = "Administrator, Manager")]
public IActionResult Create()
{
return View();
Expand All @@ -149,6 +150,7 @@ public async Task<IActionResult> Create([Bind("ID,FirstName,LastName,Address,ZIP
}

// GET: Customer/Edit/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
Expand Down Expand Up @@ -200,6 +202,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,FirstName,LastName,Addre
}

// GET: Customer/Delete/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Delete(int? id)
{
if (id == null)
Expand Down
3 changes: 3 additions & 0 deletions web/Controllers/DistributorController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public async Task<IActionResult> Details(int? id)
}

// GET: Distributor/Create
[Authorize(Roles = "Administrator, Manager")]
public IActionResult Create()
{
return View();
Expand All @@ -142,6 +143,7 @@ public async Task<IActionResult> Create([Bind("ID,Name,Address,ZIP,City,Country"
}

// GET: Distributor/Edit/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
Expand Down Expand Up @@ -193,6 +195,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,Name,Address,ZIP,City,Co
}

// GET: Distributor/Delete/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Delete(int? id)
{
if (id == null)
Expand Down
2 changes: 2 additions & 0 deletions web/Controllers/EvidenceController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ public async Task<IActionResult> Create([Bind("ID,ItemID,WarehouseID,CustomerID,
}

// GET: Evidence/Edit/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Edit(int? id)
{
if (id == null)
Expand Down Expand Up @@ -206,6 +207,7 @@ public async Task<IActionResult> Edit(int id, [Bind("ID,ItemID,WarehouseID,Custo
}

// GET: Evidence/Delete/5
[Authorize(Roles = "Administrator, Manager")]
public async Task<IActionResult> Delete(int? id)
{
if (id == null)
Expand Down
11 changes: 8 additions & 3 deletions web/Views/Customer/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@
@Html.DisplayFor(modelItem => item.Country)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
<a asp-action="Details" asp-route-id="@item.ID">Details</a> |
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
<a asp-action="Details" asp-route-id="@item.ID">Details</a>
@if (User.Identity.IsAuthenticated)
{
if (User.IsInRole("Administrator") || User.IsInRole("Manager")) {
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
}
}
</td>
</tr>
}
Expand Down
12 changes: 9 additions & 3 deletions web/Views/Distributor/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,15 @@
@Html.DisplayFor(modelItem => item.Country)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
<a asp-action="Details" asp-route-id="@item.ID">Details</a> |
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
<a asp-action="Details" asp-route-id="@item.ID">Details</a>
@if (User.Identity.IsAuthenticated)
{
if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
{
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
}
}
</td>
</tr>
}
Expand Down
14 changes: 11 additions & 3 deletions web/Views/Evidence/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,17 @@
@Html.DisplayFor(modelItem => item.Customer.LastName), @Html.DisplayFor(modelItem => item.Customer.FirstName)
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a> |
<a asp-action="Details" asp-route-id="@item.ID">Details</a> |
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
<a asp-action="Details" asp-route-id="@item.ID">Details</a>
@if (User.Identity.IsAuthenticated)
{

if (User.IsInRole("Administrator") || User.IsInRole("Manager"))
{
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
}
}

</td>
</tr>
}
Expand Down
12 changes: 12 additions & 0 deletions web/Views/Item/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@

<div class="border rounded-3 p-4 shadow">

<form asp-action="Index" method="get">
<div class="form-actions no-color">
<p>
Find by name: <input type="text" name="SearchString" value="@ViewData["CurrentFilter"]" />
<input type="submit" value="Search" class="btn border border-primary btn-default" />
@* Filter by activity: <input type="checkbox" name="activeBool" value="@ViewData["ActiveFilter"]" />
<input type="submit" value="Confirm" class="btn btn-default" /> | *@
<a asp-action="Index" class="btn border border-primary btn-default">Clear filter</a>
<a asp-action="Create" class="no-decor btn btn-primary float-end">Add New</a>
</p>
</div>
</form>

<form asp-action="Index" method="get">
<div class="form-actions no-color">
Expand Down
7 changes: 3 additions & 4 deletions web/Views/Warehouse/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,12 @@
{
if (User.IsInRole("Manager"))
{
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
}
else if (User.IsInRole("Administrator"))
{
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
<a asp-action="Create" asp-route-id="@item.ID">Create</a>
<a asp-action="Edit" asp-route-id="@item.ID">Edit</a>
<a asp-action="Delete" asp-route-id="@item.ID">Delete</a>
}
}
</td>
Expand Down