jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

portal: refactor group views into module

Browse source
This commit is contained in:
Iain Learmonth 2022-05-04 13:17:01 +01:00
parent a1aa252bc0
commit ef1f3208fc
6 changed files with 94 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/portal/__init__.py
View file

@ -9,11 +9,14 @@ from app.models.bridges import BridgeConf, Bridge
from app.models.alarms import Alarm
from app import Origin, Proxy
from app.models.base import Group, MirrorList
from app.portal.forms import EditGroupForm, NewGroupForm, NewOriginForm, EditOriginForm, LifecycleForm, \
from app.portal.forms import NewOriginForm, EditOriginForm, LifecycleForm, \
NewBridgeConfForm, EditBridgeConfForm, NewMirrorListForm
from app.portal.group import group, NewGroupForm, EditGroupForm
portal = Blueprint("portal", __name__, template_folder="templates", static_folder="static")
portal.register_blueprint(group, url_prefix="/group")
@portal.app_template_filter("mirror_expiry")
def calculate_mirror_expiry(s: datetime) -> str:
@ -43,64 +46,6 @@ def portal_home():
lastweek=lastweek, proxies=proxies)
@portal.route("/groups")
def view_groups():
groups = Group.query.order_by(Group.group_name).all()
return render_template("list.html.j2",
section="group",
title="Groups",
item="group",
items=groups,
new_link=url_for("portal.new_group"))
@portal.route("/group/new", methods=['GET', 'POST'])
def new_group():
form = NewGroupForm()
if form.validate_on_submit():
group = Group()
group.group_name = form.group_name.data
group.description = form.description.data
group.eotk = form.eotk.data
group.created = datetime.utcnow()
group.updated = datetime.utcnow()
try:
db.session.add(group)
db.session.commit()
flash(f"Created new group {group.group_name}.", "success")
return redirect(url_for("portal.edit_group", group_id=group.id))
except exc.SQLAlchemyError as e:
print(e)
flash("Failed to create new group.", "danger")
return redirect(url_for("portal.view_groups"))
return render_template("new.html.j2", section="group", form=form)
@portal.route('/group/edit/<group_id>', methods=['GET', 'POST'])
def edit_group(group_id):
group = Group.query.filter(Group.id == group_id).first()
if group is None:
return Response(render_template("error.html.j2",
section="group",
header="404 Group Not Found",
message="The requested group could not be found."),
status=404)
form = EditGroupForm(description=group.description,
eotk=group.eotk)
if form.validate_on_submit():
group.description = form.description.data
group.eotk = form.eotk.data
group.updated = datetime.utcnow()
try:
db.session.commit()
flash("Saved changes to group.", "success")
except exc.SQLAlchemyError:
flash("An error occurred saving the changes to the group.", "danger")
return render_template("group.html.j2",
section="group",
group=group, form=form)
@portal.route("/origin/new", methods=['GET', 'POST'])
@portal.route("/origin/new/<group_id>", methods=['GET', 'POST'])
def new_origin(group_id=None):