Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8fe7bcfb71 | ||
|
|
28ee65809e | ||
|
|
1b42f3310a | ||
|
|
8d2144895e |
@@ -85,9 +85,10 @@ class Permission(enum.Enum):
|
||||
return False
|
||||
|
||||
if self == Permission.APPROVE_NEW or \
|
||||
self == Permission.APPROVE_CHANGES or \
|
||||
self == Permission.APPROVE_RELEASE or \
|
||||
self == Permission.APPROVE_SCREENSHOT:
|
||||
self == Permission.APPROVE_CHANGES or \
|
||||
self == Permission.APPROVE_RELEASE or \
|
||||
self == Permission.APPROVE_SCREENSHOT or \
|
||||
self == Permission.SEE_THREAD:
|
||||
return user.rank.atLeast(UserRank.EDITOR)
|
||||
else:
|
||||
raise Exception("Non-global permission checked globally. Use Package.checkPerm or User.checkPerm instead.")
|
||||
|
||||
@@ -372,7 +372,7 @@ def makeVCSRelease(id, branch):
|
||||
filename = randomString(10) + ".zip"
|
||||
destPath = os.path.join("app/public/uploads", filename)
|
||||
with open(destPath, "wb") as fp:
|
||||
repo.archive(fp)
|
||||
repo.archive(fp, format="zip")
|
||||
|
||||
release.url = "/uploads/" + filename
|
||||
print(release.url)
|
||||
|
||||
@@ -133,7 +133,7 @@ def parseForumListPage(id, page, out, extra=None):
|
||||
|
||||
out[id] = row
|
||||
|
||||
return False
|
||||
return True
|
||||
|
||||
def getTopicsFromForum(id, out={}, extra=None):
|
||||
print("Fetching all topics from forum {}".format(id))
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
<option value="importscreenshots" selected>Import screenshots from VCS</option>
|
||||
<option value="importdepends">Import dependencies from downloads</option>
|
||||
<option value="modprovides">Set provides to mod name</option>
|
||||
<option value="recalcscores">Recalc pakage scores</option>
|
||||
<option value="recalcscores">Recalc package scores</option>
|
||||
<option value="vcsrelease">Create VCS releases</option>
|
||||
</select>
|
||||
<input type="submit" value="Perform" />
|
||||
</form>
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
<ul>
|
||||
{% for t in threads %}
|
||||
<li><a href="{{ url_for('thread_page', id=t.id) }}">{{ t.title }}</a> by {{ t.author.display_name }}</li>
|
||||
{% else %}
|
||||
<li><i>No threads found</i></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -20,11 +20,13 @@ from flask_user import *
|
||||
from flask.ext import menu
|
||||
from app import app
|
||||
from app.models import *
|
||||
from app.tasks.importtasks import importRepoScreenshot, importAllDependencies
|
||||
from celery import uuid
|
||||
from app.tasks.importtasks import importRepoScreenshot, importAllDependencies, makeVCSRelease
|
||||
from app.tasks.forumtasks import importTopicList
|
||||
from flask_wtf import FlaskForm
|
||||
from wtforms import *
|
||||
from app.utils import loginUser, rank_required
|
||||
from app.utils import loginUser, rank_required, triggerNotif
|
||||
import datetime
|
||||
|
||||
@app.route("/admin/", methods=["GET", "POST"])
|
||||
@rank_required(UserRank.ADMIN)
|
||||
@@ -70,6 +72,25 @@ def admin_page():
|
||||
|
||||
db.session.commit()
|
||||
return redirect(url_for("admin_page"))
|
||||
elif action == "vcsrelease":
|
||||
for package in Package.query.filter(Package.repo.isnot(None)).all():
|
||||
if package.releases.count() != 0:
|
||||
continue
|
||||
|
||||
rel = PackageRelease()
|
||||
rel.package = package
|
||||
rel.title = datetime.date.today().isoformat()
|
||||
rel.url = ""
|
||||
rel.task_id = uuid()
|
||||
rel.approved = True
|
||||
db.session.add(rel)
|
||||
db.session.commit()
|
||||
|
||||
makeVCSRelease.apply_async((rel.id, "master"), task_id=rel.task_id)
|
||||
|
||||
msg = "{}: Release {} created".format(package.title, rel.title)
|
||||
triggerNotif(package.author, current_user, msg, rel.getEditURL())
|
||||
db.session.commit()
|
||||
|
||||
else:
|
||||
flash("Unknown action: " + action, "error")
|
||||
|
||||
@@ -37,11 +37,11 @@ def build_packages_query():
|
||||
type = PackageType[type_name.upper()]
|
||||
|
||||
title = "Packages"
|
||||
query = Package.query.filter_by(soft_deleted=False)
|
||||
query = Package.query.filter_by(soft_deleted=False, approved=True)
|
||||
|
||||
if type is not None:
|
||||
title = type.value + "s"
|
||||
query = query.filter_by(type=type, approved=True)
|
||||
query = query.filter_by(type=type)
|
||||
|
||||
search = request.args.get("q")
|
||||
if search is not None and search.strip() != "":
|
||||
|
||||
@@ -27,8 +27,10 @@ from wtforms.validators import *
|
||||
|
||||
@app.route("/threads/")
|
||||
def threads_page():
|
||||
threads = Thread.query.filter_by(private=False).all()
|
||||
return render_template("threads/list.html", threads=threads)
|
||||
query = Thread.query
|
||||
if not Permission.SEE_THREAD.check(current_user):
|
||||
query = query.filter_by(private=False)
|
||||
return render_template("threads/list.html", threads=query.all())
|
||||
|
||||
@app.route("/threads/<int:id>/", methods=["GET", "POST"])
|
||||
def thread_page(id):
|
||||
|
||||
Reference in New Issue
Block a user