Numerum/Incepted
Numerum/Incepted
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Улучшил обнаружение заблокированных пользователей

Browse Source
This commit is contained in:
Andrei 2023-03-11 23:10:37 +05:00
parent 3e958e13e3
commit 34462d76ee
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main.py
View File

@ -94,7 +94,7 @@ def admin():
@app.route('/template/<int:id_template>/create') @app.route('/template/<int:id_template>/create')
def create_by_template(id_template): def create_by_template(id_template):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_template = data_session.query(Projects).filter(Projects.id == id_template).first() current_template = data_session.query(Projects).filter(Projects.id == id_template).first()
if current_template: if current_template:
@ -120,7 +120,7 @@ def create_by_template(id_template):
@app.route('/template/<int:id_template>') @app.route('/template/<int:id_template>')
def template_project(id_template): def template_project(id_template):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_template).first() current_project = data_session.query(Projects).filter(Projects.id == id_template).first()
if current_project: if current_project:
@ -136,7 +136,7 @@ def template_project(id_template):
@app.route('/showcase/link/<int:id_link>/delete') @app.route('/showcase/link/<int:id_link>/delete')
def delete_link(id_link): def delete_link(id_link):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
if current_user.role in [1, 4]: if current_user.role in [1, 4]:
data_session = db_session.create_session() data_session = db_session.create_session()
link = data_session.query(ShowCaseLink).filter(ShowCaseLink.id == id_link).first() link = data_session.query(ShowCaseLink).filter(ShowCaseLink.id == id_link).first()
@ -153,7 +153,7 @@ def delete_link(id_link):
@app.route('/showcase', methods=['GET', 'POST']) @app.route('/showcase', methods=['GET', 'POST'])
def showcase(): def showcase():
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
form = AddLink() if current_user.role in [1, 4] else None form = AddLink() if current_user.role in [1, 4] else None
data_session = db_session.create_session() data_session = db_session.create_session()
if request.method == 'POST' and current_user.role in [1, 4]: if request.method == 'POST' and current_user.role in [1, 4]:
@ -178,7 +178,7 @@ def showcase():
@app.route('/project/<int:id_project>/quest/<int:id_task>/edit', methods=['GET', 'POST']) @app.route('/project/<int:id_project>/quest/<int:id_task>/edit', methods=['GET', 'POST'])
def edit_quest(id_project, id_task): def edit_quest(id_project, id_task):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
current_task = data_session.query(Quests).filter(Quests.id == id_task).first() current_task = data_session.query(Quests).filter(Quests.id == id_task).first()
@ -215,7 +215,7 @@ def edit_quest(id_project, id_task):
@app.route('/project/<int:id_project>/file/<int:id_file>/delete') @app.route('/project/<int:id_project>/file/<int:id_file>/delete')
def delete_file(id_project, id_file): def delete_file(id_project, id_file):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
from_path = request.args.get('from') if request.args.get('from') else '' from_path = request.args.get('from') if request.args.get('from') else ''
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
@ -246,7 +246,7 @@ def delete_file(id_project, id_file):
@app.route('/project/<int:id_project>/quest/<int:id_task>', methods=['GET', 'POST']) @app.route('/project/<int:id_project>/quest/<int:id_task>', methods=['GET', 'POST'])
def task_project(id_project, id_task): def task_project(id_project, id_task):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
current_task = data_session.query(Quests).filter(Quests.id == id_task).first() current_task = data_session.query(Quests).filter(Quests.id == id_task).first()
@ -314,7 +314,7 @@ def task_project(id_project, id_task):
@app.route('/project/<int:id_project>/quest/new', methods=['GET', 'POST']) @app.route('/project/<int:id_project>/quest/new', methods=['GET', 'POST'])
def new_task_project(id_project): def new_task_project(id_project):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
if current_project: if current_project:
@ -345,7 +345,7 @@ def new_task_project(id_project):
@app.route('/project/<int:id_project>/edit', methods=['GET', 'POST']) @app.route('/project/<int:id_project>/edit', methods=['GET', 'POST'])
def edit_project(id_project): def edit_project(id_project):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
if current_project: if current_project:
@ -403,7 +403,7 @@ def edit_project(id_project):
@app.route('/project/<int:id_project>', methods=['POST', 'GET']) @app.route('/project/<int:id_project>', methods=['POST', 'GET'])
def project(id_project): def project(id_project):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
current_project = data_session.query(Projects).filter(Projects.id == id_project).first() current_project = data_session.query(Projects).filter(Projects.id == id_project).first()
if current_project: if current_project:
@ -486,7 +486,7 @@ def recovery():
@app.route('/project/<int:id_project>/delete', methods=['GET', 'POST']) @app.route('/project/<int:id_project>/delete', methods=['GET', 'POST'])
def delete_project(id_project): def delete_project(id_project):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
project_del = data_session.query(Projects).filter(Projects.id == id_project).first() project_del = data_session.query(Projects).filter(Projects.id == id_project).first()
if project_del: if project_del:
@ -511,7 +511,7 @@ def delete_project(id_project):
@app.route('/user/<string:_login>', methods=['GET', 'POST']) @app.route('/user/<string:_login>', methods=['GET', 'POST'])
def user_view(_login): def user_view(_login):
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
user = data_session.query(User).filter(User.login == _login).first() user = data_session.query(User).filter(User.login == _login).first()
if user: if user:
@ -532,7 +532,7 @@ def user_view(_login):
@app.route('/projects/new', methods=['GET', 'POST']) @app.route('/projects/new', methods=['GET', 'POST'])
def new_project(): def new_project():
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
form = ProjectForm() form = ProjectForm()
data_session = db_session.create_session() data_session = db_session.create_session()
list_users = list( list_users = list(
@ -569,7 +569,7 @@ def new_project():
@app.route('/projects', methods=['GET', 'POST']) @app.route('/projects', methods=['GET', 'POST'])
def projects(): def projects():
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
find = False find = False
form = FindProjectForm() form = FindProjectForm()
data_session = db_session.create_session() data_session = db_session.create_session()
@ -597,7 +597,7 @@ def projects():
@app.route('/profile', methods=['GET', 'POST']) @app.route('/profile', methods=['GET', 'POST'])
def profile(): def profile():
if current_user.is_authenticated: if current_user.is_authenticated and not current_user.banned:
data_session = db_session.create_session() data_session = db_session.create_session()
form = EditProfileForm( form = EditProfileForm(
CombinedMultiDict((request.files, request.form)), CombinedMultiDict((request.files, request.form)),

2
static/css/project.css
View File

@ -224,7 +224,7 @@
align-items: flex-start; align-items: flex-start;
} }
.quest_title_block { .quest_title_block {
width: 100%; width: 60%;
height: 4vw; height: 4vw;
display: flex; display: flex;
align-items: center; align-items: center;

2
templates/project.html
View File

@ -62,7 +62,7 @@
data-bs-target="#panelsStayOpen-collapse{{ quest.id }}" aria-expanded="true" data-bs-target="#panelsStayOpen-collapse{{ quest.id }}" aria-expanded="true"
aria-controls="panelsStayOpen-collapse{{ quest.id }}"> aria-controls="panelsStayOpen-collapse{{ quest.id }}">
<div class="quest_button_block_one"> <div class="quest_button_block_one">
<div class="quest_title_block"> <div class="quest_title_block"{% if project.is_template %}style="width:100%;!important"{% endif %}>
<p class="quest_title">{{ quest.name }}</p> <p class="quest_title">{{ quest.name }}</p>
</div> </div>
{% if not project.is_template %} {% if not project.is_template %}