MemberId, not member
This commit is contained in:
parent
1d88fb351c
commit
86952308ce
@ -61,6 +61,7 @@ class Controller {
|
||||
|
||||
if ($esId){
|
||||
$session = Session::getSession($esId);
|
||||
// !TODO: return member_id here ???
|
||||
\OCP\JSON::success($session);
|
||||
exit();
|
||||
}
|
||||
|
@ -64,9 +64,15 @@ try{
|
||||
exit();
|
||||
break;
|
||||
case 'join-session':
|
||||
$response = "true"; // should fail when session is non-existent
|
||||
OCA\Office\Controller::joinSession(array(
|
||||
'es_id' => $request->getParam('args/es_id')
|
||||
));
|
||||
exit();
|
||||
break;
|
||||
case 'user-list':
|
||||
$members = OCA\Office\Member::getMembersByEsId(
|
||||
$request->getParam('args/es_id')
|
||||
);
|
||||
break;
|
||||
case 'sync-ops':
|
||||
$seqHead = $request->getParam('args/seq_head');
|
||||
|
@ -60,7 +60,7 @@
|
||||
<name>*dbprefix*office_member</name>
|
||||
<declaration>
|
||||
<field>
|
||||
<name>member</name>
|
||||
<name>member_id</name>
|
||||
<type>integer</type>
|
||||
<default>1</default>
|
||||
<notnull>true</notnull>
|
||||
|
@ -29,7 +29,7 @@ class Member {
|
||||
}
|
||||
|
||||
public static function getMember($id){
|
||||
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`= ?');
|
||||
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`= ?');
|
||||
$result = $query->execute(array($id));
|
||||
return $result->fetchRow();
|
||||
}
|
||||
@ -42,7 +42,7 @@ class Member {
|
||||
|
||||
$placeholders = array_fill(0, $memberCount, '?');
|
||||
$stmt = implode(', ', $placeholders);
|
||||
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member`IN (' . $stmt . ')');
|
||||
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_member` WHERE `member_id`IN (' . $stmt . ')');
|
||||
$result = $query->execute(array($ids));
|
||||
return $result->fetchAll();
|
||||
}
|
||||
|
@ -60,7 +60,6 @@ class Op {
|
||||
if ($seq == ""){
|
||||
$seq = -1;
|
||||
}
|
||||
$oplist = array();
|
||||
$query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*office_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC');
|
||||
$result = $query->execute(array($esId, $seq));
|
||||
return $result->fetchAll();
|
||||
|
Loading…
x
Reference in New Issue
Block a user