projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOD avancement dans l'extraction d'une conversation entière
[euphorik.git]
/
modules
/
erl
/
euphorik_protocole.erl
diff --git
a/modules/erl/euphorik_protocole.erl
b/modules/erl/euphorik_protocole.erl
index
3305c37
..
c15ada1
100755
(executable)
--- a/
modules/erl/euphorik_protocole.erl
+++ b/
modules/erl/euphorik_protocole.erl
@@
-113,7
+113,6
@@
profile(
{nick_format, Nick_format_str},
{view_times, View_times},
{view_tooltips, View_tooltips},
{nick_format, Nick_format_str},
{view_times, View_times},
{view_tooltips, View_tooltips},
- {main_page, Main_page},
{conversations, {array, Conversations_json}}
]
) ->
{conversations, {array, Conversations_json}}
]
) ->
@@
-135,7
+134,6
@@
profile(
list_to_atom(Nick_format_str),
View_times,
View_tooltips,
list_to_atom(Nick_format_str),
View_times,
View_tooltips,
- Main_page,
Conversations) of
ok ->
json_reponse_ok();
Conversations) of
ok ->
json_reponse_ok();
@@
-272,6
+270,7
@@
wait_event_page_chat(User, Racines_conversations, Message_count, Last_message_id
{nick, Mess#minichat.pseudo},
{login, User_mess#user.login},
{content, Mess#minichat.contenu},
{nick, Mess#minichat.pseudo},
{login, User_mess#user.login},
{content, Mess#minichat.contenu},
+ {root, Mess#minichat.racine_id},
{answer_to, {array, lists:map(
fun(Id_mess) ->
{ok, M} = euphorik_bd:message_by_id(Id_mess),
{answer_to, {array, lists:map(
fun(Id_mess) ->
{ok, M} = euphorik_bd:message_by_id(Id_mess),