X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=modules%2Ferl%2Feuphorik_protocole.erl;h=fcce9c345131bf55e8f342e80ed5c3ffd20bb802;hp=24569dec04bd8722d87dd2aca80db3ca727aa183;hb=3ea00589df90388456e8587b1bebdeab0f7e99fa;hpb=d547231312e9e9c2f2c055673e0186334bbb67fd

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index 24569de..fcce9c3 100755
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -208,10 +208,13 @@ wait_event([{page, "admin"}, {last_troll, Last_troll}]) ->
                {trolls, {array, 
                   lists:map(
                      fun(T) ->                        
+                        {ok, User} = euphorik_bd:user_by_id(T#troll.id_user),
                         {struct,
                            [
                               {troll_id, T#troll.id},
-                              {content, T#troll.content}
+                              {content, T#troll.content},
+                              {author, User#user.pseudo},
+                              {author_id, User#user.id}
                            ]
                         }
                      end,
@@ -390,7 +393,7 @@ mod_troll(
          User_id = User#user.id,
          case euphorik_bd:troll_by_id(Troll_id) of
             {ok, #troll{id_user = User_id}} ->
-               euphorik_bd:mod_troll(User#user.id, Content),
+               euphorik_bd:mod_troll(Troll_id, Content),
                json_reponse_ok();
             _ ->
                erreur("Vous ne posséder pas ce troll")
@@ -412,7 +415,7 @@ del_troll(
          User_id = User#user.id,
          case euphorik_bd:troll_by_id(Troll_id) of
             {ok, #troll{id_user = User_id}} ->
-               euphorik_bd:del_troll(User#user.id),
+               euphorik_bd:del_troll(Troll_id),
                json_reponse_ok();
             _ ->
                erreur("Vous ne posséder pas ce troll")