Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-07 02:47:27 +02:00
Code Issues Projects Releases Wiki Activity

Fixed debug page version string

Browse Source
This commit is contained in:
Rsl1122 2019-08-24 11:22:34 +03:00
parent 5bba175558
commit df780c3099
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/DebugPage.java
View File

@ -24,6 +24,7 @@ import com.djrapitops.plan.system.cache.SessionCache;
import com.djrapitops.plan.system.file.FileResource; import com.djrapitops.plan.system.file.FileResource;
import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.info.server.properties.ServerProperties; import com.djrapitops.plan.system.info.server.properties.ServerProperties;
import com.djrapitops.plan.system.update.VersionCheckSystem;
import com.djrapitops.plan.system.webserver.cache.ResponseCache; import com.djrapitops.plan.system.webserver.cache.ResponseCache;
import com.djrapitops.plan.utilities.formatting.Formatter; import com.djrapitops.plan.utilities.formatting.Formatter;
import com.djrapitops.plan.utilities.formatting.Formatters; import com.djrapitops.plan.utilities.formatting.Formatters;
@ -53,6 +54,7 @@ public class DebugPage implements Page {
private final Database database; private final Database database;
private final ServerInfo serverInfo; private final ServerInfo serverInfo;
private final VersionCheckSystem versionCheckSystem;
private final CombineDebugLogger debugLogger; private final CombineDebugLogger debugLogger;
private final Timings timings; private final Timings timings;
private final ErrorHandler errorHandler; private final ErrorHandler errorHandler;
@ -64,12 +66,14 @@ public class DebugPage implements Page {
Database database, Database database,
ServerInfo serverInfo, ServerInfo serverInfo,
Formatters formatters, Formatters formatters,
VersionCheckSystem versionCheckSystem,
DebugLogger debugLogger, DebugLogger debugLogger,
Timings timings, Timings timings,
ErrorHandler errorHandler ErrorHandler errorHandler
) { ) {
this.database = database; this.database = database;
this.serverInfo = serverInfo; this.serverInfo = serverInfo;
this.versionCheckSystem = versionCheckSystem;
this.debugLogger = (CombineDebugLogger) debugLogger; this.debugLogger = (CombineDebugLogger) debugLogger;
this.timings = timings; this.timings = timings;
this.errorHandler = errorHandler; this.errorHandler = errorHandler;
@ -169,7 +173,9 @@ public class DebugPage implements Page {
ServerProperties serverProperties = serverInfo.getServerProperties(); ServerProperties serverProperties = serverInfo.getServerProperties();
content.append("<pre>### Server Information<br>") content.append("<pre>### Server Information<br>")
.append("**Plan Version:** ${version}<br>"); .append("**Plan Version:** ")
.append(versionCheckSystem.getCurrentVersion())
.append("<br>");
content.append("**Server:** "); content.append("**Server:** ");
content.append(serverProperties.getName()) content.append(serverProperties.getName())

2
Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/PageFactory.java
View File

@ -90,7 +90,7 @@ public class PageFactory {
public DebugPage debugPage() { public DebugPage debugPage() {
return new DebugPage( return new DebugPage(
dbSystem.get().getDatabase(), serverInfo.get(), formatters.get(), dbSystem.get().getDatabase(), serverInfo.get(), formatters.get(), versionCheckSystem.get(),
debugLogger.get(), timings.get(), errorHandler.get() debugLogger.get(), timings.get(), errorHandler.get()
); );
} }