wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:owncloud/owncloud

Browse source
This commit is contained in:
Frank Karlitschek 2012-06-04 12:46:22 +02:00
commit 8755fd88bb
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files/js/fileactions.js
View file

@ -51,7 +51,7 @@ FileActions={
var actions=this.get(mime,type);
return actions[name];
},
display:function(parent){
display:function(parent, filename, type){
FileActions.currentFile=parent;
$('#fileList span.fileactions, #fileList td.date a.action').remove();
var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
@ -62,6 +62,8 @@ FileActions={
parent.children('a.name').append('<span class="fileactions" />');
var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType());
for(name in actions){
// no rename and share action for the 'Shared' dir
if((name=='Rename' || name =='Share') && type=='dir' && filename=='Shared') { continue; }
if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
var img=FileActions.icons[name];
if(img.call){
@ -84,7 +86,7 @@ FileActions={
parent.find('a.name>span.fileactions').append(element);
}
}
if(actions['Delete']){
if(actions['Delete'] && (type!='dir' || filename != 'Shared')){ // no delete action for the 'Shared' dir
var img=FileActions.icons['Delete'];
if(img.call){
img=img(file);

2
apps/files/js/files.js
View file

@ -56,7 +56,7 @@ $(document).ready(function() {
// Sets the file-action buttons behaviour :
$('tr').live('mouseenter',function(event) {
FileActions.display($(this).children('td.filename'));
FileActions.display($(this).children('td.filename'), $(this).attr('data-file'), $(this).attr('data-type'));
});
$('tr').live('mouseleave',function(event) {
FileActions.hide();

4
lib/files.php
View file

@ -170,7 +170,7 @@ class OC_Files {
* @param file $target
*/
public static function move($sourceDir,$source,$targetDir,$target){
if(OC_User::isLoggedIn()){
if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
$targetFile=self::normalizePath($targetDir.'/'.$target);
$sourceFile=self::normalizePath($sourceDir.'/'.$source);
return OC_Filesystem::rename($sourceFile,$targetFile);
@ -224,7 +224,7 @@ class OC_Files {
* @param file $name
*/
public static function delete($dir,$file){
if(OC_User::isLoggedIn()){
if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) {
$file=$dir.'/'.$file;
return OC_Filesystem::unlink($file);
}