diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-25 00:06:20 +0200 |
| commit | fd5af9aff4245127f32f3b90dbd6e52792984447 (patch) | |
| tree | f77a3b903067f05f036578835700f262f6ea71a9 /apps/files | |
| parent | c8255a170c2d7449b4e7728edd2237eea71dca80 (diff) | |
| parent | d84b1adf34817b4b261db35e51f72ac78adf8e27 (diff) | |
| download | nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.tar.gz nextcloud-server-fd5af9aff4245127f32f3b90dbd6e52792984447.zip | |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/fileactions.js | 4 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 39e848cec80..89e7bdd7ad7 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -77,6 +77,10 @@ FileActions={ parent.children('a.name').append('<span class="fileactions" />'); var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions()); for(name in actions){ + // NOTE: Temporary fix to prevent rename action in root of Shared directory + if (name == 'Rename' && $('#dir').val() == '/Shared') { + continue; + } if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ var img=FileActions.icons[name]; if(img.call){ diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 6667b5488af..8faeae3939c 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -9,7 +9,7 @@ $name = str_replace('%2F','/', $name); $directory = str_replace('+','%20',urlencode($file['directory'])); $directory = str_replace('%2F','/', $directory); ?> - <tr data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'> + <tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'> <td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)"> <?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?> <a class="name" href="<?php if($file['type'] == 'dir') echo $_['baseURL'].$directory.'/'.$name; else echo $_['downloadURL'].$directory.'/'.$name; ?>" title=""> |