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

# Calendar:

Browse source 
* refactoring: use a Gapi.net45 NuGet package, drop conflicting code.
* insert an event @HairCutQuery.
* View the choosen calendar from the account page
This commit is contained in:
Paul Schneider 2017-07-05 15:47:22 +02:00
commit 4810f3efba
123 changed files with 270 additions and 24385 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Yavsc/Controllers/ManageController.cs
View file

@ -116,7 +116,8 @@ namespace Yavsc.Controllers
Avatar = user.Avatar,
BankInfo = user.BankInfo,
DiskUsage = user.DiskUsage,
DiskQuota = user.DiskQuota
DiskQuota = user.DiskQuota,
DedicatedCalendarId = user.DedicatedGoogleCalendar
};
model.HaveProfessionalSettings = _dbContext.Performers.Any(x => x.PerformerId == user.Id);
var usrActs = _dbContext.UserActivities.Include(a=>a.Does).Where(a=> a.UserId == user.Id);
@ -275,7 +276,7 @@ namespace Yavsc.Controllers
{
return View(new SetGoogleCalendarViewModel {
ReturnUrl = returnUrl,
Calendars = await _calendarManager.GetCalendarsAsync(User.GetUserId(), pageToken)
Calendars = await _calendarManager.GetCalendarsAsync(User.GetUserId(), pageToken)
});
}