From d9c67ffeff9bcd4bfce26aa4a6e859ae6db097ee Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 6 May 2017 23:45:29 -0400 Subject: [PATCH] ignore edit param --- src/Api/Controllers/CiphersController.cs | 8 ++++---- src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql | 3 ++- src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs index 470c8ee510..59ab5d4b14 100644 --- a/src/Api/Controllers/CiphersController.cs +++ b/src/Api/Controllers/CiphersController.cs @@ -134,12 +134,12 @@ namespace Bit.Api.Controllers public async Task PostImport([FromBody]ImportRequestModel model) { var userId = _userService.GetProperUserId(User).Value; - var folderCiphers = model.Folders.Select(f => f.ToFolder(userId)).ToList(); - var otherCiphers = model.Logins.Select(l => l.ToCipherDetails(userId)).ToList(); + var folders = model.Folders.Select(f => f.ToFolder(userId)).ToList(); + var ciphers = model.Logins.Select(l => l.ToCipherDetails(userId)).ToList(); await _cipherService.ImportCiphersAsync( - folderCiphers, - otherCiphers, + folders, + ciphers, model.FolderRelationships); } diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql index 03704c0404..d283768699 100644 --- a/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql +++ b/src/Sql/dbo/Stored Procedures/CipherDetails_Create.sql @@ -9,7 +9,8 @@ @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7), @FolderId UNIQUEIDENTIFIER, - @Favorite BIT + @Favorite BIT, + @Edit BIT -- not used AS BEGIN SET NOCOUNT ON diff --git a/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql b/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql index 73f510b688..d0ec6c9977 100644 --- a/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql +++ b/src/Sql/dbo/Stored Procedures/CipherDetails_Update.sql @@ -9,7 +9,8 @@ @CreationDate DATETIME2(7), @RevisionDate DATETIME2(7), @FolderId UNIQUEIDENTIFIER, - @Favorite BIT + @Favorite BIT, + @Edit BIT -- not used AS BEGIN SET NOCOUNT ON