Changeset 12776 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs

Timestamp:

07/17/15 16:57:22 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive-3.3:

• HiveStatisticsGenerator.cs: Jobs that are deleted are now automatically marked as completed in the hive statistics tables. This was added because when a job got paused and deleted afterwards, it would still show up as ongoing job in the hive statistics.
• Minor changes in NewHiveService.cs

HeuristicLab.Services.WebApp.Statistics-3.3:

• Expired slaves are now shown as offline (previously the last known state was shown)
• Adjusted dialog height

HeuristicLab.Services.WebApp-3.3:

• Changed string.Format to Path.Combine to concate directory paths

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

@@ -106 +106 @@
       PluginManager pluginManager = PluginManager.Instance;
       foreach (var plugin in pluginManager.Plugins) {
-        if (File.Exists(string.Format(@"{0}\{1}\{1}.js", PluginManager.PluginsDirectory, plugin.Name))) {
+        var path = Path.Combine(PluginManager.PluginsDirectory, plugin.Name, string.Concat(plugin.Name, ".js"));
+        if (File.Exists(path)) {
           jsFiles.Add(string.Format("WebApp/plugins/{0}/{0}.js", plugin.Name));
         }