diff --git a/js/controllers/website-controller.js b/js/controllers/website-controller.js index 552a3ee..e5b4567 100644 --- a/js/controllers/website-controller.js +++ b/js/controllers/website-controller.js @@ -444,9 +444,6 @@ app.controller('websiteCtrl', [ } }; - - - vm.removeAllFiles = function (r, opts) { console.log(r); console.log(opts); @@ -471,7 +468,6 @@ app.controller('websiteCtrl', [ return; } var pkg = Auth.oauth3.pkg('www@daplie.com'); - debugger; return pkg.remove({ hostname: r.domain, domain: r.domain, @@ -487,9 +483,6 @@ app.controller('websiteCtrl', [ }); }; - - - vm.Sites.archive = function (r) { var pkg = Auth.oauth3.pkg('www@daplie.com'); return pkg.archive({ @@ -506,27 +499,27 @@ app.controller('websiteCtrl', [ }); }; - - - - - - - - vm.doSomething = function (r) { window.alert("Fix me"); }; - vm.Shares = {}; - vm.Shares.invite = function (r) { - vm.domainName = r.domain; - if (vm.copiedShareMode === undefined) { - r.shareMode = ''; + vm.shareFolderFrom = function (r, opts) { + var sharePath; + if (vm.breadcrumbsPath.join('/') === '' && vm.breadcrumbs.join('/') === '') { + sharePath = '/'; } else { - r.shareMode = vm.copiedShareMode; + sharePath = vm.breadcrumbsPath.join('/'); } - r.sharePath = vm.breadcrumbsPath.join(''); + // FIXME: shareMode may be broken + opts = { + sharePath: sharePath, + shareMode: '' + }; + vm.Shares.invite(r, opts); + }; + + vm.Shares = {}; + vm.Shares.invite = function (r, opts) { var pkg = Auth.oauth3.pkg('www@daplie.com'); return pkg.invite({ comment: r.shareEmail @@ -535,27 +528,13 @@ app.controller('websiteCtrl', [ , tld: r.tld , sld: r.sld //, sub: r.sub - , path: r.sharePath - , mode: r.shareMode + , path: opts.sharePath || r.sharePath + , mode: opts.shareMode || r.shareMode }).then(function (result) { var arr = r.sharedWith || []; arr.push(result.data); r.sharedWith = arr; - var msg; - var person = result.data.comment; - if (result.data.error) { - msg = result.data.error.message; - } else { - vm.displaySpinner = 'hidden'; - msg = 'shared with ' + person; - vm.showInviteContainer = false; - vm.showSharesContainer = true; - r.shareEmail = ''; - $scope.selectedAccess = []; - vm.currentFolder = undefined; - } - vm.buildNotification(result, msg); - // window.alert(JSON.stringify(result.data)); + window.alert(JSON.stringify(result.data)); }); }; diff --git a/templates/website.html b/templates/website.html index d6906eb..a2e6ecb 100644 --- a/templates/website.html +++ b/templates/website.html @@ -212,7 +212,7 @@
- +