claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add validation for person twitter handle.

Browse Source
This commit is contained in:
Natalia Portillo
2019-06-30 21:00:04 +01:00
parent 2a31a164db
commit 0fabe49a14
3 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cicm.Database/Models/Person.cs
View File

@@ -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
{
@@ -22,6 +23,7 @@ namespace Cicm.Database.Models
public DateTime? DeathDate { get; set; }
[Url]
public string Webpage { get; set; }
[Remote("VerifyTwitter", "People", "Admin")]
public string Twitter { get; set; }
public string Facebook { get; set; }
public Guid Photo { get; set; }

91
cicm_web/Areas/Admin/Controllers/PeopleController.cs
View File

@@ -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<IActionResult> Index()
{
var cicmContext = _context.People.Include(p => p.CountryOfBirth);
IIncludableQueryable<Person, Iso31661Numeric> cicmContext = _context.People.Include(p => p.CountryOfBirth);
return View(await cicmContext.ToListAsync());
}
// GET: People/Details/5
public async Task<IActionResult> 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,7 +50,9 @@ namespace cicm_web.Areas.Admin.Controllers
// more details see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Create([Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] Person person)
public async Task<IActionResult> Create(
[Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")]
Person person)
{
if(ModelState.IsValid)
{
@@ -65,24 +60,22 @@ namespace cicm_web.Areas.Admin.Controllers
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<IActionResult> 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,12 +84,11 @@ namespace cicm_web.Areas.Admin.Controllers
// more details see http://go.microsoft.com/fwlink/?LinkId=317598.
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Edit(int id, [Bind("Name,Surname,BirthDate,DeathDate,Webpage,Twitter,Facebook,Photo,CountryOfBirthId,Id")] Person person)
public async Task<IActionResult> 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)
{
@@ -107,54 +99,49 @@ namespace cicm_web.Areas.Admin.Controllers
}
catch(DbUpdateConcurrencyException)
{
if (!PersonExists(person.Id))
{
return NotFound();
}
else
{
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<IActionResult> 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<IActionResult> 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.");
}
}

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.864</Version>
<Version>3.0.99.865</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>