DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #404 from owncloud/fix-disconnect

Browse Source 
Fix member disconnection routes
This commit is contained in:
VicDeo 2014-11-19 03:34:35 +03:00
commit 3cac42ce87
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appinfo/routes.php
View File

@ -16,8 +16,8 @@ $application->registerRoutes($this, array(
'routes' => array(
//users
array('name' => 'user#rename', 'url' => 'ajax/user/rename', 'verb' => 'POST'),
array('name' => 'user#disconnect', 'url' => 'ajax/user/disconnect/{memberId}', 'verb' => 'POST'),
array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest/{memberId}', 'verb' => 'POST'),
array('name' => 'user#disconnectUser', 'url' => 'ajax/user/disconnect', 'verb' => 'POST'),
array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest', 'verb' => 'POST'),
//session
array('name' => 'session#joinAsUser', 'url' => 'ajax/session/joinasuser/{fileId}', 'verb' => 'POST'),
array('name' => 'session#joinAsGuest', 'url' => 'ajax/session/joinasguest/{token}', 'verb' => 'POST'),

1
controller/usercontroller.php
View File

@ -19,6 +19,7 @@ use \OCP\AppFramework\Http\JSONResponse;
use \OCA\Documents\Db;
class UserController extends Controller {
public function __construct($appName, IRequest $request){
parent::__construct($appName, $request);
}

9
js/documents.js
View File

@ -682,12 +682,15 @@ var documentsMain = {
var url = '';
if (documentsMain.isGuest){
url = OC.generateUrl('apps/documents/ajax/user/disconnectGuest/{member_id}', {member_id: documentsMain.memberId});
url = OC.generateUrl('apps/documents/ajax/user/disconnectGuest', {});
} else {
url = OC.generateUrl('apps/documents/ajax/user/disconnect/{member_id}', {member_id: documentsMain.memberId});
url = OC.generateUrl('apps/documents/ajax/user/disconnect', {});
}
$.post(url, {esId: documentsMain.esId});
$.post(url, {
memberId : documentsMain.memberId,
esId: documentsMain.esId
});
documentsMain.show();
// });