Fix member disconnection routes
This commit is contained in:
Родитель
46f141ab68
Коммит
3e5b13f752
|
@ -16,8 +16,8 @@ $application->registerRoutes($this, array(
|
||||||
'routes' => array(
|
'routes' => array(
|
||||||
//users
|
//users
|
||||||
array('name' => 'user#rename', 'url' => 'ajax/user/rename', 'verb' => 'POST'),
|
array('name' => 'user#rename', 'url' => 'ajax/user/rename', 'verb' => 'POST'),
|
||||||
array('name' => 'user#disconnect', 'url' => 'ajax/user/disconnect/{memberId}', 'verb' => 'POST'),
|
array('name' => 'user#disconnectUser', 'url' => 'ajax/user/disconnect', 'verb' => 'POST'),
|
||||||
array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest/{memberId}', 'verb' => 'POST'),
|
array('name' => 'user#disconnectGuest', 'url' => 'ajax/user/disconnectGuest', 'verb' => 'POST'),
|
||||||
//session
|
//session
|
||||||
array('name' => 'session#joinAsUser', 'url' => 'ajax/session/joinasuser/{fileId}', 'verb' => 'POST'),
|
array('name' => 'session#joinAsUser', 'url' => 'ajax/session/joinasuser/{fileId}', 'verb' => 'POST'),
|
||||||
array('name' => 'session#joinAsGuest', 'url' => 'ajax/session/joinasguest/{token}', 'verb' => 'POST'),
|
array('name' => 'session#joinAsGuest', 'url' => 'ajax/session/joinasguest/{token}', 'verb' => 'POST'),
|
||||||
|
|
|
@ -19,6 +19,7 @@ use \OCP\AppFramework\Http\JSONResponse;
|
||||||
use \OCA\Documents\Db;
|
use \OCA\Documents\Db;
|
||||||
|
|
||||||
class UserController extends Controller {
|
class UserController extends Controller {
|
||||||
|
|
||||||
public function __construct($appName, IRequest $request){
|
public function __construct($appName, IRequest $request){
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
}
|
}
|
||||||
|
@ -35,7 +36,7 @@ class UserController extends Controller {
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
*/
|
*/
|
||||||
public function disconnectGuest($memberId, $esId){
|
public function disconnectGuest($memberId, $esId){
|
||||||
return $this->disconnect($memberId, $esId);
|
return $this->disconnect($memberId, $esId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function disconnect($memberId, $esId){
|
private function disconnect($memberId, $esId){
|
||||||
|
|
|
@ -682,12 +682,15 @@ var documentsMain = {
|
||||||
|
|
||||||
var url = '';
|
var url = '';
|
||||||
if (documentsMain.isGuest){
|
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 {
|
} 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();
|
documentsMain.show();
|
||||||
// });
|
// });
|
||||||
|
|
Загрузка…
Ссылка в новой задаче