From 99ea6dcb7b478fed0157f1104fdea6bb3181e9e0 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 3 Jan 2021 22:04:23 +0100
Subject: [PATCH] =?UTF-8?q?Po=20loginu=20orga=20se=20objev=C3=AD=20orgovsk?=
=?UTF-8?q?=C3=A1=20hlavn=C3=AD=20str=C3=A1nka?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/main.py | 8 +++++++-
mo/web/org.py | 1 -
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/mo/web/main.py b/mo/web/main.py
index c05c0ad7..6560fc5d 100644
--- a/mo/web/main.py
+++ b/mo/web/main.py
@@ -57,7 +57,13 @@ def login():
mo.users.login(user)
db.get_session().commit()
session['uid'] = user.user_id
- return redirect(form.next.data or url_for('index'))
+ url = form.next.data
+ if not url:
+ if user.is_admin or user.is_org:
+ url = url_for('org_index')
+ else:
+ url = url_for('index')
+ return redirect(url)
return render_template('login.html', form=form, error=error)
diff --git a/mo/web/org.py b/mo/web/org.py
index c5973eda..5c811f78 100644
--- a/mo/web/org.py
+++ b/mo/web/org.py
@@ -2,7 +2,6 @@ from flask import render_template, g, redirect, url_for, request
from sqlalchemy.orm import aliased
import mo.db as db
-import mo.rights
from mo.web.table import Table, Column
from mo.web import app
--
GitLab