Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
This commit is contained in:
commit
0edce1796b
|
@ -121,7 +121,7 @@ class OC_Share {
|
|||
}
|
||||
} else if (isset($uid)) {
|
||||
// TODO Check if this is necessary, only constructor needs it as IN. It would be better for other queries to just return =$uid
|
||||
$in = "'".$uid."'";
|
||||
$in .= "'".$uid."'";
|
||||
$groups = OC_Group::getUserGroups($uid);
|
||||
foreach ($groups as $group) {
|
||||
$in .= ", '".$uid."@".$group."'";
|
||||
|
|
|
@ -27,7 +27,7 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
// Sets the file link behaviour :
|
||||
$('td.filename.name a').live('click',function(event) {
|
||||
$('td.filename a').live('click',function(event) {
|
||||
event.preventDefault();
|
||||
var filename=$(this).parent().parent().data('file');
|
||||
if(!FileList.isLoading(filename)){
|
||||
|
|
Loading…
Reference in New Issue