bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-05 23:53:33 +00:00
Code Issues Releases Wiki Activity

share page

Browse Source
This commit is contained in:
Kyle Spearrin
2019-05-10 13:22:35 -04:00
parent 9aef584494
commit 9668bd85c1
10 changed files with 384 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/App/Pages/Vault/AddEditPageViewModel.cs
View File

@@ -80,7 +80,7 @@ namespace Bit.App.Pages
FieldOptionsCommand = new Command<AddEditPageFieldViewModel>(FieldOptions);
Uris = new ExtendedObservableCollection<LoginUriView>();
Fields = new ExtendedObservableCollection<AddEditPageFieldViewModel>();
Collections = new ExtendedObservableCollection<AddEditPageCollectionViewModel>();
Collections = new ExtendedObservableCollection<CollectionViewModel>();
TypeOptions = new List<KeyValuePair<string, CipherType>>
{
@@ -149,7 +149,7 @@ namespace Bit.App.Pages
public List<KeyValuePair<string, string>> OwnershipOptions { get; set; }
public ExtendedObservableCollection<LoginUriView> Uris { get; set; }
public ExtendedObservableCollection<AddEditPageFieldViewModel> Fields { get; set; }
public ExtendedObservableCollection<AddEditPageCollectionViewModel> Collections { get; set; }
public ExtendedObservableCollection<CollectionViewModel> Collections { get; set; }
public int TypeSelectedIndex
{
get => _typeSelectedIndex;
@@ -360,6 +360,13 @@ namespace Bit.App.Pages
if(!EditMode && Cipher.OrganizationId != null)
{
if(!Collections?.Any(c => c.Checked) ?? true)
{
await Page.DisplayAlert(AppResources.AnErrorHasOccurred, AppResources.SelectOneCollection,
AppResources.Ok);
return false;
}
Cipher.CollectionIds = Collections.Any() ?
new HashSet<string>(Collections.Where(c => c.Checked).Select(c => c.Collection.Id)) : null;
}
@@ -575,12 +582,12 @@ namespace Bit.App.Pages
if(Cipher.OrganizationId != null)
{
var cols = _writeableCollections.Where(c => c.OrganizationId == Cipher.OrganizationId)
.Select(c => new AddEditPageCollectionViewModel { Collection = c }).ToList();
.Select(c => new CollectionViewModel { Collection = c }).ToList();
Collections.ResetWithRange(cols);
}
else
{
Collections.ResetWithRange(new List<AddEditPageCollectionViewModel>());
Collections.ResetWithRange(new List<CollectionViewModel>());
}
HasCollections = Collections.Any();
}
@@ -615,18 +622,6 @@ namespace Bit.App.Pages
}
}
public class AddEditPageCollectionViewModel : ExtendedViewModel
{
private bool _checked;
public Core.Models.View.CollectionView Collection { get; set; }
public bool Checked
{
get => _checked;
set => SetProperty(ref _checked, value);
}
}
public class AddEditPageFieldViewModel : ExtendedViewModel
{
private FieldView _field;