Merge branch 'master' into db-purge

Conflicts: wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
2012-11-05 20:40:54 -03:00
parent c86bd15382 29e397ab3f
commit fe8516bb94
32 changed files with 220 additions and 362 deletions
--- a/mindplot/src/main/javascript/DesignerModel.js
+++ b/mindplot/src/main/javascript/DesignerModel.js
@@ -83,6 +83,7 @@ mindplot.DesignerModel = new Class({

    addTopic:function (topic) {
        $assert(topic, "topic can not be null");
+        $assert(typeof  topic.getId() == "number", "id is not a number:" + topic.getId());
        this._topics.push(topic);
    },