Skip to content

Commit

Permalink
Merge pull request #100 from Thorfusion/dev
Browse files Browse the repository at this point in the history
fix import still uses old cache type
  • Loading branch information
maggi373 authored Dec 22, 2024
2 parents bd83069 + 3af47f5 commit 9abdae8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions asite.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from models.user import User
from mysql import connector
from werkzeug.utils import secure_filename
from models.common import public_repo_url, debug, host, port, md5_repo_url, R2_URL, db_name, R2_BUCKET, new_user, migratetechnic, solderpy_version, R2_REGION, R2_ENDPOINT, R2_ACCESS_KEY, R2_SECRET_KEY, UPLOAD_FOLDER, common, DB_IS_UP, cache_size, cache_algorithm
from models.common import public_repo_url, debug, host, port, md5_repo_url, R2_URL, db_name, R2_BUCKET, new_user, migratetechnic, solderpy_version, R2_REGION, R2_ENDPOINT, R2_ACCESS_KEY, R2_SECRET_KEY, UPLOAD_FOLDER, common, DB_IS_UP, cache_size, cache_ttl
from models.user_modpack import User_modpack

__version__ = solderpy_version
Expand Down Expand Up @@ -282,7 +282,7 @@ def mainsettings():
if User.get_permission_token(session["token"], "solder_env") == 0:
return redirect(request.referrer)

return render_template("mainsettings.html", nam=__name__, deb=debug, host=host, port=port, public_repo_url=public_repo_url, md5_repo_url=md5_repo_url, r2_url=R2_URL, db_name=db_name, versr=__version__, r2_bucket=R2_BUCKET, newuser=new_user, technic=migratetechnic, DB_IS_UP=DB_IS_UP, cache_size=cache_size, cache_algorithm=cache_algorithm)
return render_template("mainsettings.html", nam=__name__, deb=debug, host=host, port=port, public_repo_url=public_repo_url, md5_repo_url=md5_repo_url, r2_url=R2_URL, db_name=db_name, versr=__version__, r2_bucket=R2_BUCKET, newuser=new_user, technic=migratetechnic, DB_IS_UP=DB_IS_UP, cache_size=cache_size, cache_ttl=cache_ttl)


@asite.route("/apikeylibrary", methods=["GET"])
Expand Down
4 changes: 2 additions & 2 deletions templates/mainsettings.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</tr>
</thead>
<tr>
<td class="">cache_algorithm:</td>
<td class="">{{cache_algorithm}}</td>
<td class="">cache_ttl:</td>
<td class="">{{cache_ttl}}</td>
</tr>
<tr>
<td class="">cache_size:</td>
Expand Down

0 comments on commit 9abdae8

Please sign in to comment.