Merge branch 'vnext' of https://github.com/pazof/yavsc.git
This commit is contained in:
@ -56,17 +56,13 @@ public class GCMController : Controller
|
|||||||
_context.GCMDevices.Add(declaration);
|
_context.GCMDevices.Add(declaration);
|
||||||
_context.SaveChanges();
|
_context.SaveChanges();
|
||||||
}
|
}
|
||||||
if (declaration.LatestActivityUpdate > default(DateTime))
|
var latestActivityUpdate = _context.Activities.Aggregate(
|
||||||
{
|
(a,b)=>a.DateModified>b.DateModified?a:b
|
||||||
var latestActivityUpdate = _context.Activities.Aggregate(
|
).DateModified;
|
||||||
(a,b)=>a.DateModified>b.DateModified?a:b
|
return Json(new {
|
||||||
).DateModified;
|
IsAnUpdate = deviceAlreadyRegistered,
|
||||||
return Json(new {
|
UpdateActivities = latestActivityUpdate>declaration.LatestActivityUpdate
|
||||||
IsAnUpdate = deviceAlreadyRegistered,
|
});
|
||||||
UpdateActivities = latestActivityUpdate>declaration.LatestActivityUpdate?true:false
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return Json(new { IsAnUpdate = deviceAlreadyRegistered });
|
|
||||||
}
|
}
|
||||||
return new BadRequestObjectResult(ModelState);
|
return new BadRequestObjectResult(ModelState);
|
||||||
}
|
}
|
||||||
|
@ -192,10 +192,11 @@ namespace Yavsc.Controllers
|
|||||||
_context.SaveChanges();
|
_context.SaveChanges();
|
||||||
ViewData["StatusMessage"] = "Post modified";
|
ViewData["StatusMessage"] = "Post modified";
|
||||||
return RedirectToAction("Index");
|
return RedirectToAction("Index");
|
||||||
} // TODO Else hit me hard
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ViewData["StatusMessage"] = "Access denied ...";
|
ViewData["StatusMessage"] = "Accès restreint";
|
||||||
|
return new ChallengeResult();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return View(blog);
|
return View(blog);
|
||||||
|
Reference in New Issue
Block a user