diff options
| -rw-r--r-- | controller/credentialcontroller.php | 4 | ||||
| -rw-r--r-- | js/app/directives/iconpicker.js | 7 | ||||
| -rw-r--r-- | js/app/services/credentialservice.js | 7 | ||||
| -rw-r--r-- | lib/Db/CredentialMapper.php | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php index abc76a21..c435715c 100644 --- a/controller/credentialcontroller.php +++ b/controller/credentialcontroller.php @@ -69,7 +69,7 @@ class CredentialController extends ApiController { public function createCredential($changed, $created, $credential_id, $custom_fields, $delete_time, $description, $email, $expire_time, $favicon, $files, $guid, - $hidden, $label, $otp, $password, $renew_interval, + $hidden, $icon, $label, $otp, $password, $renew_interval, $tags, $url, $username, $vault_id, $compromised) { $credential = array( 'credential_id' => $credential_id, @@ -85,7 +85,7 @@ class CredentialController extends ApiController { 'username' => $username, 'password' => $password, 'url' => $url, - 'icon' => $favicon, + 'icon' => json_encode($icon), 'favicon' => $favicon, 'renew_interval' => $renew_interval, 'expire_time' => $expire_time, diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js index 2cc60594..210dfacb 100644 --- a/js/app/directives/iconpicker.js +++ b/js/app/directives/iconpicker.js @@ -129,7 +129,9 @@ }; scope.useIcon = function() { - + if(!scope.credential.icon){ + scope.credential.icon = {}; + } if(scope.customIcon){ var data = scope.customIcon.data; scope.credential.icon.type = data.substring(data.lastIndexOf(":")+1,data.lastIndexOf(";")); @@ -138,9 +140,6 @@ $http.get(scope.selectedIcon.url).then(function(result) { var base64Data = window.btoa(result.data); var mimeType = 'svg+xml'; - if(!scope.credential.icon){ - scope.credential.icon = {}; - } scope.credential.icon.type = mimeType; scope.credential.icon.content = base64Data; }); diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js index 53fa67c0..e8bc2a41 100644 --- a/js/app/services/credentialservice.js +++ b/js/app/services/credentialservice.js @@ -41,10 +41,7 @@ 'changed': null, 'tags': [], 'email': null, - 'icon':{ - 'type': false, - 'content': '' - }, + 'icon': null, 'username': null, 'password': null, 'url': null, @@ -364,4 +361,4 @@ } }; }]); -}());
\ No newline at end of file +}()); diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php index 413d288d..dd2522f1 100644 --- a/lib/Db/CredentialMapper.php +++ b/lib/Db/CredentialMapper.php @@ -167,7 +167,7 @@ class CredentialMapper extends QBMapper { $credential->setUsername($raw_credential['username']); $credential->setPassword($raw_credential['password']); $credential->setUrl($raw_credential['url']); - $credential->setIcon($raw_credential['favicon']); + $credential->setIcon($raw_credential['icon']); $credential->setRenewInterval($raw_credential['renew_interval']); $credential->setExpireTime($raw_credential['expire_time']); $credential->setDeleteTime($raw_credential['delete_time']); |