From 3ba27e624f2c36044a982bc0cd69f07106e61e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 31 Aug 2012 01:05:36 +0200 Subject: [PATCH] unify permissions (2/3): change apps to use OC::PERMISSION_X --- apps/files/js/fileactions.js | 8 +++---- apps/files_sharing/js/public.js | 2 +- apps/files_sharing/js/share.js | 2 +- apps/files_versions/js/versions.js | 2 +- core/js/share.js | 36 +++++++++++++++--------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 89e7bdd7ad..f587e99f96 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -156,12 +156,12 @@ $(document).ready(function(){ } else { var downloadScope = 'file'; } - FileActions.register(downloadScope,'Download', FileActions.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){ + FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){ window.location=OC.filePath('files', 'ajax', 'download.php') + encodeURIComponent('?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val())); }); }); -FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){ +FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){ if(Files.cancelUpload(filename)) { if(filename.substr){ filename=[filename]; @@ -179,11 +179,11 @@ FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){r $('.tipsy').remove(); }); -FileActions.register('all','Rename', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ +FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){ FileList.rename(filename); }); -FileActions.register('dir','Open', FileActions.PERMISSION_READ, '', function(filename){ +FileActions.register('dir','Open', OC.PERMISSION_READ, '', function(filename){ window.location=OC.linkTo('files', 'index.php') + '&dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); }); diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 1ab61d476e..92b626bba1 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -10,7 +10,7 @@ $(document).ready(function() { // Show file preview if previewer is available, images are already handled by the template if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') { // Trigger default action if not download TODO - var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ); + var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ); if (typeof action === 'undefined') { $('#noPreview').show(); } else { diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 79ab4adeba..a171751589 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -2,7 +2,7 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') { OC.Share.loadIcons('file'); - FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) { + FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) { // Return the correct sharing icon if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback if ($('#dir').val() == '/') { diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index e34a6f50ca..a9cf6171e4 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -11,7 +11,7 @@ $(document).ready(function() { $(document).ready(function(){ if (typeof FileActions !== 'undefined') { // Add history button to files/index.php - FileActions.register('file','History', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){ + FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){ if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback diff --git a/core/js/share.js b/core/js/share.js index 8bfbdd36e1..f8ff690732 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -129,7 +129,7 @@ OC.Share={ } html += '
'; } - if (possiblePermissions & OC.Share.PERMISSION_SHARE) { + if (possiblePermissions & OC.PERMISSION_SHARE) { html += ''; html += ''; @@ -187,7 +187,7 @@ OC.Share={ var shareWith = selected.item.value.shareWith; $(this).val(shareWith); // Default permissions are Read and Share - var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE; + var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE; OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() { OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions); $('#shareWith').val(''); @@ -224,24 +224,24 @@ OC.Share={ } OC.Share.itemShares[shareType].push(shareWith); var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = ''; - if (permissions & OC.Share.PERMISSION_CREATE) { + if (permissions & OC.PERMISSION_CREATE) { createChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_UPDATE) { + if (permissions & OC.PERMISSION_UPDATE) { updateChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_DELETE) { + if (permissions & OC.PERMISSION_DELETE) { deleteChecked = 'checked="checked"'; editChecked = 'checked="checked"'; } - if (permissions & OC.Share.PERMISSION_SHARE) { + if (permissions & OC.PERMISSION_SHARE) { shareChecked = 'checked="checked"'; } var html = '
  • '; html += shareWith; - if (possiblePermissions & OC.Share.PERMISSION_CREATE || possiblePermissions & OC.Share.PERMISSION_UPDATE || possiblePermissions & OC.Share.PERMISSION_DELETE) { + if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { if (editChecked == '') { html += '
    • '; @@ -386,7 +386,7 @@ $(document).ready(function() { $(checkboxes).filter('input[name="edit"]').attr('checked', true); } } - var permissions = OC.Share.PERMISSION_READ; + var permissions = OC.PERMISSION_READ; $(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) { permissions |= $(checkbox).data('permissions'); }); @@ -398,7 +398,7 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); if (this.checked) { // Create a link - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.Share.PERMISSION_READ, function() { + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() { OC.Share.showLink(itemSource); // TODO Change icon }); @@ -423,7 +423,7 @@ $(document).ready(function() { if (event.keyCode == 13) { var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); - OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ, function() { + OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() { $('#linkPassText').val(''); $('#linkPassText').attr('placeholder', 'Password protected'); });