diff --git a/Cicm.Database/Models/Person.cs b/Cicm.Database/Models/Person.cs index 66222632..b68f53e3 100644 --- a/Cicm.Database/Models/Person.cs +++ b/Cicm.Database/Models/Person.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using Microsoft.AspNetCore.Mvc; namespace Cicm.Database.Models { @@ -21,8 +22,9 @@ namespace Cicm.Database.Models [DataType(DataType.Date)] public DateTime? DeathDate { get; set; } [Url] - public string Webpage { get; set; } - public string Twitter { get; set; } + public string Webpage { get; set; } + [Remote("VerifyTwitter", "People", "Admin")] + public string Twitter { get; set; } public string Facebook { get; set; } public Guid Photo { get; set; } public int? DocumentPersonId { get; set; } diff --git a/cicm_web/Areas/Admin/Controllers/PeopleController.cs b/cicm_web/Areas/Admin/Controllers/PeopleController.cs index 2b507730..84f5078d 100644 --- a/cicm_web/Areas/Admin/Controllers/PeopleController.cs +++ b/cicm_web/Areas/Admin/Controllers/PeopleController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Query; namespace cicm_web.Areas.Admin.Controllers { @@ -12,7 +13,7 @@ namespace cicm_web.Areas.Admin.Controllers [Authorize] public class PeopleController : Controller { - private readonly cicmContext _context; + readonly cicmContext _context; public PeopleController(cicmContext context) { @@ -22,25 +23,17 @@ namespace cicm_web.Areas.Admin.Controllers // GET: People public async Task Index() { - var cicmContext = _context.People.Include(p => p.CountryOfBirth); + IIncludableQueryable cicmContext = _context.People.Include(p => p.CountryOfBirth); return View(await cicmContext.ToListAsync()); } // GET: People/Details/5 public async Task Details(int? id) { - if (id == null) - { - return NotFound(); - } + if(id == null) return NotFound(); - var person = await _context.People - .Include(p => p.CountryOfBirth) - .FirstOrDefaultAsync(m => m.Id == id); - if (person == null) - { - return NotFound(); - } + Person person = await _context.People.Include(p => p.CountryOfBirth).FirstOrDefaultAsync(m => m.Id == id); + if(person == null) return NotFound(); return View(person); } @@ -57,32 +50,32 @@ namespace cicm_web.Areas.Admin.Controllers // more details see http://go.microsoft.com/fwlink/?LinkId=317598. [HttpPost] [ValidateAntiForgeryToken] - public async Task Create([Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] Person person) + public async Task Create( + [Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] + Person person) { - if (ModelState.IsValid) + if(ModelState.IsValid) { _context.Add(person); await _context.SaveChangesAsync(); return RedirectToAction(nameof(Index)); } - ViewData["CountryOfBirthId"] = new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); + + ViewData["CountryOfBirthId"] = + new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); return View(person); } // GET: People/Edit/5 public async Task Edit(int? id) { - if (id == null) - { - return NotFound(); - } + if(id == null) return NotFound(); - var person = await _context.People.FindAsync(id); - if (person == null) - { - return NotFound(); - } - ViewData["CountryOfBirthId"] = new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); + Person person = await _context.People.FindAsync(id); + if(person == null) return NotFound(); + + ViewData["CountryOfBirthId"] = + new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); return View(person); } @@ -91,70 +84,64 @@ namespace cicm_web.Areas.Admin.Controllers // more details see http://go.microsoft.com/fwlink/?LinkId=317598. [HttpPost] [ValidateAntiForgeryToken] - public async Task Edit(int id, [Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] Person person) + public async Task Edit( + int id, [Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] + Person person) { - if (id != person.Id) - { - return NotFound(); - } + if(id != person.Id) return NotFound(); - if (ModelState.IsValid) + if(ModelState.IsValid) { try { _context.Update(person); await _context.SaveChangesAsync(); } - catch (DbUpdateConcurrencyException) + catch(DbUpdateConcurrencyException) { - if (!PersonExists(person.Id)) - { - return NotFound(); - } - else - { - throw; - } + if(!PersonExists(person.Id)) return NotFound(); + + throw; } + return RedirectToAction(nameof(Index)); } - ViewData["CountryOfBirthId"] = new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); + + ViewData["CountryOfBirthId"] = + new SelectList(_context.Iso31661Numeric, "Id", "Name", person.CountryOfBirthId); return View(person); } // GET: People/Delete/5 public async Task Delete(int? id) { - if (id == null) - { - return NotFound(); - } + if(id == null) return NotFound(); - var person = await _context.People - .Include(p => p.CountryOfBirth) - .FirstOrDefaultAsync(m => m.Id == id); - if (person == null) - { - return NotFound(); - } + Person person = await _context.People.Include(p => p.CountryOfBirth).FirstOrDefaultAsync(m => m.Id == id); + if(person == null) return NotFound(); return View(person); } // POST: People/Delete/5 - [HttpPost, ActionName("Delete")] + [HttpPost] + [ActionName("Delete")] [ValidateAntiForgeryToken] public async Task DeleteConfirmed(int id) { - var person = await _context.People.FindAsync(id); + Person person = await _context.People.FindAsync(id); _context.People.Remove(person); await _context.SaveChangesAsync(); return RedirectToAction(nameof(Index)); } - private bool PersonExists(int id) + bool PersonExists(int id) { return _context.People.Any(e => e.Id == id); } + + [AcceptVerbs("Get", "Post")] + public IActionResult VerifyTwitter(string twitter) => + twitter?.Length > 0 && twitter[0] == '@' ? Json(true) : Json("Invalid twitter handle."); } -} +} \ No newline at end of file diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj index 06315c59..ec2129c4 100644 --- a/cicm_web/cicm_web.csproj +++ b/cicm_web/cicm_web.csproj @@ -2,7 +2,7 @@ netcoreapp2.2 - 3.0.99.864 + 3.0.99.865 Canary Islands Computer Museum Copyright © 2003-2018 Natalia Portillo Canary Islands Computer Museum Website