Merge pull request #3950 from owncloud/fixing-3941-master

no anonymous upload on read-only folders
This commit is contained in:
Jörn Friedrich Dreyer 2013-07-05 03:01:56 -07:00
commit 9c855f7b3d
1 changed files with 11 additions and 9 deletions

View File

@ -163,10 +163,10 @@ OC.Share={
var allowPublicUploadStatus = false; var allowPublicUploadStatus = false;
$.each(data.shares, function(key, value) { $.each(data.shares, function(key, value) {
if (allowPublicUploadStatus) { if (allowPublicUploadStatus) {
return true; return true;
} }
allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false; allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
}); });
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />'; html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
@ -181,11 +181,13 @@ OC.Share={
html += '<div id="linkPass">'; html += '<div id="linkPass">';
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
html += '</div>'; html += '</div>';
html += '<div id="allowPublicUploadWrapper" style="display:none;">'; if (possiblePermissions & OC.PERMISSION_CREATE) {
html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />'; html += '<div id="allowPublicUploadWrapper" style="display:none;">';
html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>'; html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
html += '</div></div>'; html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
html += '<form id="emailPrivateLink" >'; html += '</div>';
}
html += '</div><form id="emailPrivateLink" >';
html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />'; html += '<input id="email" style="display:none; width:62%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />'; html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
html += '</form>'; html += '</form>';