projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0cca284
)
REPORT branche 1.1 501->501
author
Greg Burri
<greg.burri@gmail.com>
Fri, 17 Oct 2008 08:06:56 +0000
(08:06 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Fri, 17 Oct 2008 08:06:56 +0000
(08:06 +0000)
modules/erl/euphorik_protocole.erl
patch
|
blob
|
history
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
3706f68
..
a61d0c8
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-308,7
+308,7
@@
wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
{Racine_id, _, _} = Racine,
\r
case euphorik_bd:message_by_id(Racine_id) of
\r
{ok, Mess} ->
\r
{Racine_id, _, _} = Racine,
\r
case euphorik_bd:message_by_id(Racine_id) of
\r
{ok, Mess} ->
\r
- json_message(Mess, euphorik_bd:parents(Racine_id), User);
\r
+ json_message(Mess, euphorik_bd:parents
_id
(Racine_id), User);
\r
_ ->
\r
null
\r
end
\r
_ ->
\r
null
\r
end
\r
@@
-754,7
+754,7
@@
json_message(Mess, Repond_a, User) ->
{content, Mess#minichat.contenu},
\r
{root, Mess#minichat.racine_id},
\r
{answer_to, {array, lists:map(
\r
{content, Mess#minichat.contenu},
\r
{root, Mess#minichat.racine_id},
\r
{answer_to, {array, lists:map(
\r
- fun(Id_mess) ->
\r
+ fun(Id_mess) ->
\r
{ok, M} = euphorik_bd:message_by_id(Id_mess),
\r
{ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),
\r
{struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}
\r
{ok, M} = euphorik_bd:message_by_id(Id_mess),
\r
{ok, User_reponse} = euphorik_bd:user_by_mess(M#minichat.id),
\r
{struct, [{id, M#minichat.id}, {nick, M#minichat.pseudo}, {login, User_reponse#user.login}]}
\r