From f44bef765f40c07529fde7398c021daaf293c8e2 Mon Sep 17 00:00:00 2001 From: brantje Date: Mon, 3 Oct 2016 12:55:18 +0200 Subject: [PATCH] Show share link --- js/app/controllers/share.js | 4 ++-- js/templates.js | 2 +- .../partials/forms/share_credential/expire_settings.html | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js index 7cf6c949..d8437fd0 100644 --- a/js/app/controllers/share.js +++ b/js/app/controllers/share.js @@ -59,8 +59,8 @@ angular.module('passmanApp') $location.path('/vault/' + $scope.storedCredential.vault_id); }; - - + console.log($location); + $scope.share_link = $location.$$protocol + '://'+ $location.$$host + OC.generateUrl('apps/passman/share/public#') + $scope.storedCredential.guid; $scope.share_settings = { linkSharing:{ enabled: false, diff --git a/js/templates.js b/js/templates.js index ffccd238..b7d797d9 100644 --- a/js/templates.js +++ b/js/templates.js @@ -89,7 +89,7 @@ angular.module('views/partials/forms/share_credential/basics.html', []).run(['$t angular.module('views/partials/forms/share_credential/expire_settings.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/partials/forms/share_credential/expire_settings.html', - '
Enable link sharing.
Expire settings:
Share until date No expire date set
Share until views
'); + '
Enable link sharing.
Expire settings:
Share until date No expire date set
Share until views
'); }]); angular.module('views/partials/password-meter.html', []).run(['$templateCache', function($templateCache) { diff --git a/templates/views/partials/forms/share_credential/expire_settings.html b/templates/views/partials/forms/share_credential/expire_settings.html index 52c57bda..e00945bd 100644 --- a/templates/views/partials/forms/share_credential/expire_settings.html +++ b/templates/views/partials/forms/share_credential/expire_settings.html @@ -1,7 +1,8 @@
- Enable link sharing. + Enable link sharing.
+
Expire settings: