From 9fbce124c8ae8d39ecbdfabb745b154901a6fec7 Mon Sep 17 00:00:00 2001 From: brantje Date: Sun, 25 Sep 2016 23:22:41 +0200 Subject: [PATCH] Support passpack tags at import --- js/importers/importer-passpackcsv.js | 14 ++++++++++++-- js/templates.js | 2 +- templates/views/show_vault.html | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/js/importers/importer-passpackcsv.js b/js/importers/importer-passpackcsv.js index 00b2da11..e7643f7d 100644 --- a/js/importers/importer-passpackcsv.js +++ b/js/importers/importer-passpackcsv.js @@ -21,10 +21,20 @@ PassmanImporter.passpackCsv.readFile = function (file_data) { _credential.username = row[1]; _credential.password = row[2]; _credential.url = row[3]; - _credential.tags = row[4].split(' ').map(function(item){ return {text: item }}); + var tags = row[4].split(' '); + if (tags.length > 0) { + _credential.tags = tags.map(function (item) { + if (item) { + return {text: item} + } + + }).filter(function (item) { + return (item); + }); + } _credential.description = row[5]; _credential.email = row[6]; - if(_credential.label){ + if (_credential.label) { credential_list.push(_credential); } } diff --git a/js/templates.js b/js/templates.js index e0a7370e..0bef502a 100644 --- a/js/templates.js +++ b/js/templates.js @@ -107,7 +107,7 @@ angular.module('views/share_credential.html', []).run(['$templateCache', functio angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/show_vault.html', - '
{{active_vault.name}}
+
  • New credential
  • New shared credentialw
Showing deleted since: All time {{delete_time | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
{{credential.label}} {{tag.text}}
Label{{selectedCredential.label}}
Account
Password
OTP
E-mail
URL
Files
{{file.filename}} ({{file.size | bytes}})
{{field.label}}
Expire time{{selectedCredential.expire_time * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
Changed{{selectedCredential.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
Created{{selectedCredential.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
{{tag.text}}
'); + '
{{active_vault.name}}
+
  • New credential
  • New shared credentialw
Showing deleted since: All time {{delete_time | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
{{credential.label}} {{tag.text}}
Label{{selectedCredential.label}}
Account
Password
OTP
E-mail
URL
Files
{{file.filename}} ({{file.size | bytes}})
{{field.label}}
Expire time{{selectedCredential.expire_time * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
Changed{{selectedCredential.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
Created{{selectedCredential.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}
{{tag.text}}
'); }]); angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) { diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index 7ec6c0e5..8028bad4 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -47,7 +47,7 @@
-