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

MemberId is now string

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-08-12 15:53:27 +03:00 committed by Tobias Hintze
parent 1340b3bb75
commit 6d33c54c6c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ajax/controller.php
View File

@ -43,7 +43,7 @@ class Controller {
$session = Session::add($genesisPath, $hash, $path); $session = Session::add($genesisPath, $hash, $path);
} }
$session['member_id'] = Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); $session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), '#00f000');
\OCP\JSON::success($session); \OCP\JSON::success($session);
exit(); exit();
@ -71,7 +71,7 @@ class Controller {
if ($esId){ if ($esId){
$session = Session::getSession($esId); $session = Session::getSession($esId);
$session['member_id'] = Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); $session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), '#00f000');
\OCP\JSON::success($session); \OCP\JSON::success($session);
exit(); exit();
} }

6
lib/op.php
View File

@ -50,7 +50,11 @@ class Op {
public static function getOpsAfterJson($esId, $seq){ public static function getOpsAfterJson($esId, $seq){
$ops = self::getOpsAfter($esId, $seq); $ops = self::getOpsAfter($esId, $seq);
$ops = array_map( $ops = array_map(
function($x){return json_decode($x['opspec']);}, function($x){
$decoded = json_decode($x['opspec']);
$decoded['memberId'] = strval($decoded['memberId']);
return $decoded;
},
$ops $ops
); );
return $ops; return $ops;