paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing dev #62

Browse Source
This commit is contained in:
Paul Schneider
2019-09-27 06:59:20 +01:00
parent 5c4f61c3c7
commit cb5f042221
25 changed files with 276 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Yavsc/Controllers/IT/ProjectController.cs
View File

@ -20,6 +20,7 @@ namespace Yavsc.Controllers
private ApplicationDbContext _context;
ILogger _logger;
IStringLocalizer<Yavsc.YavscLocalisation> _localizer;
IStringLocalizer<BugController> _bugLocalizer;
public ProjectController(ApplicationDbContext context,
ILoggerFactory loggerFactory,
@ -69,7 +70,7 @@ namespace Yavsc.Controllers
ViewBag.PaymentIdItems = _context.PayPalPayment.CreateSelectListItems<PayPalPayment>
(p => p.OrderReference, p => $"{p.Executor.UserName} {p.PaypalPayerId} {p.OrderReference}");
ViewBag.Status = typeof(Yavsc.QueryStatus).CreateSelectListItems(null);
ViewBag.Status = _bugLocalizer.CreateSelectListItems(typeof(Yavsc.QueryStatus), Yavsc.QueryStatus.Inserted);
ViewBag.RepositoryItems = _context.GitRepositoryReference.CreateSelectListItems<GitRepositoryReference>(
u => u.Id.ToString(), u => u.ToString());

17
src/Yavsc/Controllers/Survey/BugController.cs
View File

@ -8,6 +8,7 @@ using Yavsc.Server.Helpers;
using System.Collections.Generic;
using Microsoft.AspNet.Mvc.Rendering;
using Microsoft.Extensions.Localization;
using Microsoft.AspNet.Authorization;
namespace Yavsc.Controllers
{
@ -15,11 +16,16 @@ namespace Yavsc.Controllers
{
ApplicationDbContext _context;
IStringLocalizer<BugController> _localizer;
IStringLocalizer<Yavsc.Models.IT.Fixing.Resources> _statusLocalizer;
public BugController(ApplicationDbContext context, IStringLocalizer<BugController> localizer )
public BugController(ApplicationDbContext context,
IStringLocalizer<BugController> localizer,
IStringLocalizer<Resources> statusLocalizer
)
{
_context = context;
_localizer = localizer;
_statusLocalizer = statusLocalizer;
}
// GET: Bug
@ -54,9 +60,10 @@ namespace Yavsc.Controllers
}
IEnumerable<SelectListItem> Statuses(BugStatus ?status) =>
typeof(Yavsc.Models.IT.Fixing.BugStatus).CreateSelectListItems(status);
_statusLocalizer.CreateSelectListItems(typeof(BugStatus), status);
IEnumerable<SelectListItem> Features(ApplicationDbContext context) =>
context.Feature.CreateSelectListItems<Feature>(f => f.Id.ToString(), f => f.ShortName, null)
context.Feature.CreateSelectListItems<Feature>(f => f.Id.ToString(), f => $"{f.ShortName} ({f.Description})", null)
.AddNull(_localizer["noAttachedFID"]);
// POST: Bug/Create
@ -76,6 +83,7 @@ namespace Yavsc.Controllers
}
// GET: Bug/Edit/5
[Authorize("AdministratorOnly")]
public async Task<IActionResult> Edit(long? id)
{
if (id == null)
@ -98,6 +106,7 @@ namespace Yavsc.Controllers
// POST: Bug/Edit/5
[HttpPost]
[ValidateAntiForgeryToken]
[Authorize("AdministratorOnly")]
public async Task<IActionResult> Edit(Bug bug)
{
if (ModelState.IsValid)
@ -111,6 +120,7 @@ namespace Yavsc.Controllers
// GET: Bug/Delete/5
[ActionName("Delete")]
[Authorize("AdministratorOnly")]
public async Task<IActionResult> Delete(long? id)
{
if (id == null)
@ -130,6 +140,7 @@ namespace Yavsc.Controllers
// POST: Bug/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
[Authorize("AdministratorOnly")]
public async Task<IActionResult> DeleteConfirmed(long id)
{
Bug bug = await _context.Bug.SingleAsync(m => m.Id == id);

8
src/Yavsc/Controllers/Survey/FeatureController.cs
View File

@ -7,6 +7,7 @@ using Microsoft.Data.Entity;
namespace Yavsc.Controllers
{
using Microsoft.Extensions.Localization;
using Models;
using Models.IT.Evolution;
using Yavsc.Server.Helpers;
@ -14,11 +15,14 @@ namespace Yavsc.Controllers
public class FeatureController : Controller
{
private ApplicationDbContext _context;
private IStringLocalizer<BugController> _bugLocalizer;
IEnumerable<SelectListItem> Statuses(FeatureStatus ?status) =>
typeof(FeatureStatus).CreateSelectListItems(status);
public FeatureController(ApplicationDbContext context)
_bugLocalizer.CreateSelectListItems(typeof(FeatureStatus), status);
public FeatureController(ApplicationDbContext context, IStringLocalizer<BugController> bugLocalizer)
{
_context = context;
_bugLocalizer = bugLocalizer;
}
// GET: Feature