Merge pull request #120 from pranavk/editgroups
Edit groups functionality
This commit is contained in:
commit
f63aaeb631
@ -270,6 +270,7 @@ class DocumentController extends Controller {
|
||||
'uploadMaxHumanFilesize' => \OCP\Util::humanFileSize($maxUploadFilesize),
|
||||
'allowShareWithLink' => $this->settings->getAppValue('core', 'shareapi_allow_links', 'yes'),
|
||||
'wopi_url' => $webSocket,
|
||||
'edit_groups' => $this->appConfig->getAppValue('edit_groups')
|
||||
]);
|
||||
|
||||
$policy = new ContentSecurityPolicy();
|
||||
|
@ -63,16 +63,21 @@ class SettingsController extends Controller{
|
||||
'admin',
|
||||
[
|
||||
'wopi_url' => $this->appConfig->getAppValue('wopi_url'),
|
||||
'edit_groups' => $this->appConfig->getAppValue('edit_groups')
|
||||
],
|
||||
'blank'
|
||||
);
|
||||
}
|
||||
|
||||
public function setSettings($wopi_url){
|
||||
public function setSettings($wopi_url, $edit_groups){
|
||||
if (!is_null($wopi_url)){
|
||||
$this->appConfig->setAppValue('wopi_url', $wopi_url);
|
||||
}
|
||||
|
||||
if (!is_null($edit_groups)){
|
||||
$this->appConfig->setAppValue('edit_groups', $edit_groups);
|
||||
}
|
||||
|
||||
$richMemCache = \OC::$server->getMemCacheFactory()->create('richdocuments');
|
||||
$richMemCache->clear('discovery.xml');
|
||||
|
||||
|
67
js/admin.js
67
js/admin.js
@ -1,7 +1,5 @@
|
||||
/*global OC, $ */
|
||||
|
||||
$(document).ready(function(){
|
||||
|
||||
var documentsSettings = {
|
||||
save : function() {
|
||||
$('#wopi_apply').attr('disabled', true);
|
||||
@ -17,11 +15,74 @@ $(document).ready(function(){
|
||||
);
|
||||
},
|
||||
|
||||
saveGroups: function(groups) {
|
||||
var data = {
|
||||
'edit_groups': groups.join('|')
|
||||
};
|
||||
|
||||
console.log('posting to setSettings');
|
||||
$.post(
|
||||
OC.filePath('richdocuments', 'ajax', 'admin.php'),
|
||||
data
|
||||
);
|
||||
},
|
||||
|
||||
afterSave : function(response){
|
||||
$('#wopi_apply').attr('disabled', false);
|
||||
OC.msg.finishedAction('#documents-admin-msg', response);
|
||||
},
|
||||
|
||||
initEditGroups: function() {
|
||||
var groups = $('#edit_group_select').val();
|
||||
if (groups !== '') {
|
||||
OC.Settings.setupGroupsSelect($('#edit_group_select'));
|
||||
$('.edit-groups-enable').attr('checked', 'checked');
|
||||
} else {
|
||||
$('.edit-groups-enable').attr('checked', null);
|
||||
}
|
||||
|
||||
$.get(
|
||||
OC.generateUrl('/settings/users/users'),
|
||||
{ limit: 1, pattern: 'admin' },
|
||||
function(result) {
|
||||
console.log(result);
|
||||
}
|
||||
);
|
||||
},
|
||||
|
||||
initialize: function() {
|
||||
$('#wopi_apply').on('click', documentsSettings.save);
|
||||
documentsSettings.initEditGroups();
|
||||
|
||||
$(document).on('change', '#edit_group_select', function() {
|
||||
var element = $(this).parent().find('input.edit-groups-enable');
|
||||
var groups = $(this).val();
|
||||
if (groups && groups !== '') {
|
||||
groups = groups.split('|');
|
||||
} else {
|
||||
groups = [];
|
||||
}
|
||||
|
||||
documentsSettings.saveGroups(groups);
|
||||
});
|
||||
|
||||
$(document).on('change', '.edit-groups-enable', function() {
|
||||
var $select = $(this).parent().find('#edit_group_select');
|
||||
$select.val('');
|
||||
|
||||
if (this.checked) {
|
||||
OC.Settings.setupGroupsSelect($select, {
|
||||
placeholder: t('core', 'All')
|
||||
});
|
||||
} else {
|
||||
$select.select2('destroy');
|
||||
}
|
||||
|
||||
$select.change();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
$('#wopi_apply').on('click', documentsSettings.save);
|
||||
$(document).ready(function(){
|
||||
documentsSettings.initialize();
|
||||
});
|
||||
|
@ -17,6 +17,31 @@ $.widget('oc.documentGrid', {
|
||||
jQuery.when(this._load(fileId))
|
||||
.then(function(){
|
||||
that._render();
|
||||
|
||||
if (!documentsMain.isGuest) {
|
||||
$.ajax({
|
||||
url: OC.generateUrl('/settings/users/users'),
|
||||
type: 'get',
|
||||
data: { limit: 1, pattern: OC.currentUser },
|
||||
async: false,
|
||||
success: function(result) {
|
||||
var editGroups = $('#edit_groups').val();
|
||||
documentsMain.canEdit = (editGroups === '');
|
||||
if (!documentsMain.canEdit && result.length >= 1) {
|
||||
for (var idx in result[0].groups) {
|
||||
if (editGroups.indexOf(result[0].groups[idx]) !== -1) {
|
||||
documentsMain.canEdit = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
error: function() {
|
||||
console.log('Error fetching information about current user.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
documentsMain.renderComplete = true;
|
||||
});
|
||||
},
|
||||
@ -188,6 +213,7 @@ var documentsMain = {
|
||||
fileName: null,
|
||||
baseName: null,
|
||||
canShare : false,
|
||||
canEdit: false,
|
||||
loadError : false,
|
||||
loadErrorMessage : '',
|
||||
loadErrorHint : '',
|
||||
@ -455,7 +481,7 @@ var documentsMain = {
|
||||
"&lang=" + $('li[data-id='+ documentsMain.fileId +']>a').attr('lolang') +
|
||||
"&closebutton=1" +
|
||||
"&revisionhistory=1";
|
||||
if (action === "view") {
|
||||
if (!documentsMain.canEdit || action === "view") {
|
||||
urlsrc += "&permission=readonly";
|
||||
}
|
||||
|
||||
|
@ -8,4 +8,9 @@ script('richdocuments', 'admin');
|
||||
<br /><em><?php p($l->t('URL (and port) of the Collabora Online server that provides the editing functionality as a WOPI client.')) ?></em>
|
||||
<br /><button type="button" id="wopi_apply"><?php p($l->t('Apply')) ?></button>
|
||||
<span id="documents-admin-msg" class="msg"></span>
|
||||
<br/>
|
||||
<input type="checkbox" class="edit-groups-enable" id="edit_groups_enable-richdocuments" data-appid="richdocuments" />
|
||||
<label for="edit_groups_enable-richdocuments"><?php p($l->t('Enable edit for specific groups')) ?></label>
|
||||
<br/>
|
||||
<input type="hidden" id="edit_group_select" value="<?php p($_['edit_groups'])?>" title="<?php p($l->t('All')); ?>" style="width: 200px">
|
||||
</div>
|
||||
|
@ -52,3 +52,4 @@ script('files', 'jquery.fileupload');
|
||||
<input type="hidden" id="previews_enabled" value="<?php p($_['enable_previews']) ?>" />
|
||||
<?php endif; ?>
|
||||
<input type="hidden" name="allowShareWithLink" id="allowShareWithLink" value="<?php p($_['allowShareWithLink']) ?>" />
|
||||
<input type="hidden" name="edit_groups" id="edit_groups" value="<?php p($_['edit_groups']) ?>" />
|
||||
|
Loading…
x
Reference in New Issue
Block a user