notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests 1 Projects 2 Releases 9 Packages Wiki Activity Actions

Fixes some bugs

Browse source
This commit is contained in:
Paul Schneider 2017-02-28 15:30:22 +01:00
commit b0f81edeac
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Yavsc/Controllers/ManageController.cs
View file

@ -580,8 +580,9 @@ namespace Yavsc.Controllers
} }
else ModelState.AddModelError(string.Empty, $"Access denied ({uid} vs {model.PerformerId})"); else ModelState.AddModelError(string.Empty, $"Access denied ({uid} vs {model.PerformerId})");
} }
ViewBag.Activities = _dbContext.ActivityItems(new List<UserActivity>());
ViewBag.GoogleSettings = _googleSettings; ViewBag.GoogleSettings = _googleSettings;
model.Performer = _dbContext.Users.Single(u=>u.Id == model.PerformerId);
return View(model); return View(model);
} }

4
Yavsc/Views/Manage/SetActivity.cshtml
View file

@ -41,8 +41,8 @@
var pos = loc.geometry.location; var pos = loc.geometry.location;
var lat = new Number(pos.lat); var lat = new Number(pos.lat);
var lng = new Number(pos.lng); var lng = new Number(pos.lng);
$('#'+config.latId).val(lat.toLocaleString('en')); $('#'+config.latId).val(lat.toLocaleString('fr'));
$('#'+config.longId).val(lng.toLocaleString('en')); $('#'+config.longId).val(lng.toLocaleString('fr'));
gmap.setCenter(pos); gmap.setCenter(pos);
if (marker) {  if (marker) { 
marker.setMap(null); marker.setMap(null);