michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

small fixes
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
Michele 2021-09-24 21:53:00 +01:00
parent fe886315a1
commit 633c97e0da
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Sledgemapper.Api/Handlers/GetCampaignsCommandHandler.cs
View File

@ -28,11 +28,13 @@ namespace Sledgemapper.Api.Handlers
{
var user = await _dbcontext.Users.FindAsync(command.UserId);
_dbcontext.Attach(user);
var campaigns = _dbcontext.Campaigns.Include(c => c.InvitedUsers).Include(c => c.Maps).Include(c => c.Owner).Where(campaign => campaign.OwnerId == command.UserId || campaign.InvitedUsers.Contains(user));
var campaigns = await _dbcontext.Campaigns
.Include(c => c.InvitedUsers)
.Include(c => c.Owner)
.Where(campaign => campaign.OwnerId == command.UserId || campaign.InvitedUsers.Contains(user)).ToListAsync();
return campaigns.Select(c => new Campaign { Id = c.CampaignId, Name = c.CampaignName }).ToList();
return campaigns.
Select(c => new Campaign { Id = c.CampaignId, Name = c.CampaignName, Maps = c.Maps.Select(m => new Map { SessionName = m.SessionName }).ToList() })
.ToList();
}
catch (Exception ex)
{

3
Sledgemapper/UI/MainWidget.Custom.cs
View File

@ -114,7 +114,6 @@ namespace Sledgemapper.UI
private void OnBtnToolbarDeleteClicked(object sender, EventArgs e)
{
Messenger.Publish(new ErrorMessage(this, "test"));
State.Instance.InsertMode = InsertMode.NewDelete;
ClearSelection();
@ -231,6 +230,8 @@ namespace Sledgemapper.UI
MenuCampaingNew.Enabled = true;
MenuMapNew.Enabled = false;
MenuMapOpen.Enabled = false;
MenuConnectSync.Enabled = false;
MenuConnectUpload.Enabled = false;
MenuCampaignPlayers.Enabled = false;
lblCampaign.Text = "n/a";
lblMap.Text = "n/a";