Browse Source

Merge pull request #10485 from CzBiX/login_page

Always use index.html as default page
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
commit
08b4cce72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/webui/webapplication.cpp
  2. 0
      src/webui/www/public/index.html
  3. 2
      src/webui/www/webui.qrc

4
src/webui/webapplication.cpp

@ -156,9 +156,7 @@ void WebApplication::sendWebUIFile() @@ -156,9 +156,7 @@ void WebApplication::sendWebUIFile()
const QString path {
(request().path != QLatin1String("/")
? request().path
: (session()
? QLatin1String("/index.html")
: QLatin1String("/login.html")))
: QLatin1String("/index.html"))
};
QString localPath {

0
src/webui/www/public/login.html → src/webui/www/public/index.html

2
src/webui/www/webui.qrc

@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<file>private/uploadlimit.html</file>
<file>public/css/login.css</file>
<file>public/css/noscript.css</file>
<file>public/login.html</file>
<file>public/index.html</file>
<file>public/scripts/login.js</file>
</qresource>
</RCC>

Loading…
Cancel
Save