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

Merge branch 'vnext' of https://github.com/pazof/yavsc.git

Browse Source
This commit is contained in:
Paul Schneider
2017-02-07 16:25:26 +01:00
parent 3e32ead44a 3dcec64d31
commit 96addac335
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Yavsc/ApiControllers/GCMController.cs
View File

@ -56,17 +56,13 @@ public class GCMController : Controller
_context.GCMDevices.Add(declaration);
_context.SaveChanges();
}
if (declaration.LatestActivityUpdate > default(DateTime))
{
var latestActivityUpdate = _context.Activities.Aggregate(
(a,b)=>a.DateModified>b.DateModified?a:b
).DateModified;
return Json(new {
IsAnUpdate = deviceAlreadyRegistered,
UpdateActivities = latestActivityUpdate>declaration.LatestActivityUpdate?true:false
});
}
return Json(new { IsAnUpdate = deviceAlreadyRegistered });
var latestActivityUpdate = _context.Activities.Aggregate(
(a,b)=>a.DateModified>b.DateModified?a:b
).DateModified;
return Json(new {
IsAnUpdate = deviceAlreadyRegistered,
UpdateActivities = latestActivityUpdate>declaration.LatestActivityUpdate
});
}
return new BadRequestObjectResult(ModelState);
}

5
Yavsc/Controllers/BlogspotController.cs
View File

@ -192,10 +192,11 @@ namespace Yavsc.Controllers
_context.SaveChanges();
ViewData["StatusMessage"] = "Post modified";
return RedirectToAction("Index");
} // TODO Else hit me hard
}
else
{
ViewData["StatusMessage"] = "Access denied ...";
ViewData["StatusMessage"] = "Accès restreint";
return new ChallengeResult();
}
}
return View(blog);