From d8701bbf68f5224b5f28deba5a5fa4d77bad5b2e Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Thu, 30 Jun 2016 01:41:12 +0200
Subject: [PATCH] fixed alerter, creating topic model
---
docker/docker-run.sh | 2 +-
vipra-cmd/runcfg/CMD.launch | 1 +
.../java/de/vipra/cmd/option/CreateModelCommand.java | 4 ++--
vipra-ui/app/js/alerter.js | 10 +++++-----
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/docker/docker-run.sh b/docker/docker-run.sh
index 3a03cf84..b4bdd630 100755
--- a/docker/docker-run.sh
+++ b/docker/docker-run.sh
@@ -26,4 +26,4 @@ if [ $REPLACE_WEBROOT -eq 1 ]; then
VOLUME_WEBROOT="-v $DIR/webroot:/webroot"
fi
-echo docker run -d $PORT_MAPPING $VOLUME_WEBAPPS $VOLUME_WEBROOT -v $DIR/logs:/tomcat/logs eikecochu/vipra
+docker run -d $PORT_MAPPING $VOLUME_WEBAPPS $VOLUME_WEBROOT -v $DIR/logs:/tomcat/logs eikecochu/vipra
diff --git a/vipra-cmd/runcfg/CMD.launch b/vipra-cmd/runcfg/CMD.launch
index 2748817d..53d53311 100644
--- a/vipra-cmd/runcfg/CMD.launch
+++ b/vipra-cmd/runcfg/CMD.launch
@@ -11,6 +11,7 @@
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="de.vipra.cmd.Main"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-f config2 -edS test -CE"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="vipra-cmd"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
diff --git a/vipra-cmd/src/main/java/de/vipra/cmd/option/CreateModelCommand.java b/vipra-cmd/src/main/java/de/vipra/cmd/option/CreateModelCommand.java
index bfa74d58..9750abe7 100644
--- a/vipra-cmd/src/main/java/de/vipra/cmd/option/CreateModelCommand.java
+++ b/vipra-cmd/src/main/java/de/vipra/cmd/option/CreateModelCommand.java
@@ -26,6 +26,8 @@ public class CreateModelCommand implements Command {
private TopicModelFull createModel(final String name, final TopicModelConfig modelConfig) throws Exception {
final TopicModelFull topicModel = new TopicModelFull(name, modelConfig);
topicModel.setColorSeed(random.nextLong());
+ modelConfig.setName(topicModel.getName());
+ modelConfig.setGroup(topicModel.getGroup());
dbTopicModels.createSingle(topicModel);
config.getTopicModelConfigs().put(topicModel.getName(), modelConfig);
@@ -34,8 +36,6 @@ public class CreateModelCommand implements Command {
if (!modelDir.mkdirs())
throw new Exception("could not create model directory: " + modelDir.getAbsolutePath());
- modelConfig.setName(topicModel.getName());
- modelConfig.setGroup(topicModel.getGroup());
modelConfig.saveToFile(modelDir);
return topicModel;
diff --git a/vipra-ui/app/js/alerter.js b/vipra-ui/app/js/alerter.js
index fff29de7..8859963f 100644
--- a/vipra-ui/app/js/alerter.js
+++ b/vipra-ui/app/js/alerter.js
@@ -99,23 +99,23 @@
};
Alerter.prototype.showSuccess = function() {
- return this.$alert(this, 'success', arguments);
+ return this.$alert('success', arguments);
};
Alerter.prototype.showInfo = function() {
- return this.$alert(this, 'info', arguments);
+ return this.$alert('info', arguments);
};
Alerter.prototype.showWarning = function() {
- return this.$alert(this, 'warning', arguments);
+ return this.$alert('warning', arguments);
};
Alerter.prototype.showDanger = function() {
- return this.$alert(this, 'danger', arguments);
+ return this.$alert('danger', arguments);
};
Alerter.prototype.showPrimary = function() {
- return this.$alert(this, 'primary', arguments);
+ return this.$alert('primary', arguments);
};
Alerter.prototype.unqueueAlert = function() {
--
GitLab