diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-01-17 13:17:48 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-01-22 15:33:53 +0100 |
| commit | 9bacb0e1792fac4a8f9728aec76692fd50fbcd64 (patch) | |
| tree | 6140f7e8f0b83219f0f22320d380a7bc9b53a603 /apps | |
| parent | f15deaf55635b730693b1137582c87fcfcaffcf0 (diff) | |
| download | nextcloud-server-9bacb0e1792fac4a8f9728aec76692fd50fbcd64.tar.gz nextcloud-server-9bacb0e1792fac4a8f9728aec76692fd50fbcd64.zip | |
rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/templates/part.list.php | 6 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 3 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index dfac43d1b12..1970a80e1b7 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -1,8 +1,8 @@ <script type="text/javascript"> -<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) :?> - var publicListView = true; +<?php if ( array_key_exists('disableSharing', $_) && $_['disableSharing'] == true ) :?> + var disableSharing = true; <?php else: ?> - var publicListView = false; + var disableSharing = false; <?php endif; ?> </script> diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a46d0179801..0dae4daa08a 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,7 +1,6 @@ $(document).ready(function() { - if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { - + if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !disableSharing) { FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { var item = $('#dir').val() + filename; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index efd977a1b6a..acd5353faff 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -257,7 +257,7 @@ if ($linkItem) { $list = new OCP\Template('files', 'part.list', ''); $list->assign('files', $files, false); - $list->assign('publicListView', true); + $list->assign('disableSharing', true); $list->assign('baseURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&path=', false); $list->assign('downloadURL', OCP\Util::linkToPublic('files').$urlLinkIdentifiers.'&download&path=', false); $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' ); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 647e1e08a31..bfcc521e106 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -1,8 +1,8 @@ <script type="text/javascript"> - <?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) { - echo "var publicListView = true;"; + <?php if ( array_key_exists('disableSharing', $_) && $_['disableSharing'] == true ) { + echo "var disableSharing = true;"; } else { - echo "var publicListView = false;"; + echo "var disableSharing = false;"; } ?> </script> |