From: Greg Burri <greg.burri@gmail.com>
Date: Fri, 25 Jul 2008 22:44:32 +0000 (+0000)
Subject: FIX mineur
X-Git-Tag: 1.1.0~46
X-Git-Url: https://git.euphorik.ch/?a=commitdiff_plain;h=e925149a5426cde569be280c28e74c3faade451c;p=euphorik.git

FIX mineur
---

diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index 06c2ca5..ff898b6 100644
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -262,13 +262,15 @@ euphorik.Trolls = function(client, util, formateur) {
 
 euphorik.Trolls.prototype.ajouterTrollEvent = function(data) {
    var thisTrolls = this;
+   
+   console.log(data)
 
    var XHTML = "";
-   data.trolls.each(function(trollData) {
+   data.trolls.each(function(i, trollData) {
       var troll = new euphorik.Troll(trollData.content, trollData.author);
       var trollId = trollData.troll_id;
       thisTrolls.trolls[trollId] = troll;
-   
+      
       XHTML +=
          '<div id="troll' + trollId + '" class="troll">' +
          '<span class="content">' + thisTrolls.formateur.traitementComplet(troll.content, troll.author) + '</span>' +
diff --git a/modules/Makefile b/modules/Makefile
index 32edb72..933a6d4 100755
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -17,7 +17,7 @@ $(rep_ebin)/euphorik_requests.beam \
 $(rep_ebin)/euphorik_protocole.beam \
 $(rep_ebin)/euphorik_daemon.beam \
 $(rep_ebin)/euphorik_bd.beam \
-$(rep_ebin)/euphorik_bd_update.beam \
+$(rep_ebin)/euphorik_bd_admin.beam \
 $(rep_ebin)/euphorik_common.beam \
 $(rep_ebin)/euphorik_test.beam
 
@@ -26,7 +26,7 @@ $(rep_ebin)/euphorik_bd.beam: $(rep_erl)/euphorik_bd.erl $(rep_include)/euphorik
 	erlc $(erlc_params)
    
 # Module pour la mise à jour de la BD
-$(rep_ebin)/euphorik_bd_update.beam: $(rep_erl)/euphorik_bd_update.erl $(rep_erl)/euphorik_bd.erl $(rep_include)/euphorik_bd.hrl $(rep_include)/euphorik_defines.hrl
+$(rep_ebin)/euphorik_bd_admin.beam: $(rep_erl)/euphorik_bd_admin.erl $(rep_erl)/euphorik_bd.erl $(rep_include)/euphorik_bd.hrl $(rep_include)/euphorik_defines.hrl
 	erlc $(erlc_params)
 
 # Module permettant l'extraction des conversations du minichat
@@ -46,7 +46,7 @@ $(rep_ebin)/euphorik_protocole.beam: $(rep_erl)/euphorik_protocole.erl $(rep_inc
 #	erlc $(erlc_params)
       
 # Module effectuant periodiquement certaines tâches
-$(rep_ebin)/euphorik_daemon.beam: $(rep_erl)/euphorik_daemon.erl $(rep_include)/euphorik_defines.hrl
+$(rep_ebin)/euphorik_daemon.beam: $(rep_erl)/euphorik_daemon.erl $(rep_include)/euphorik_defines.hrl $(rep_erl)/euphorik_bd_admin.erl
 	erlc $(erlc_params)
    
 # Module avec plein de bordel dedant