rm /profile route

Author: HadronCollider

app/server.py

@@ -5,7 +5,6 @@
 from datetime import datetime, timedelta
 from os.path import join
 from sys import argv
-from app.main.check_packs.pack_config import DEFAULT_REPORT_TYPE_INFO
 
 import bson
 import pandas as pd
@@ -22,7 +21,8 @@
 from db.db_types import Check
 from lti_session_passback.lti import utils
 from lti_session_passback.lti.check_request import check_request
-from main.check_packs import BASE_PACKS, BaseCriterionPack, DEFAULT_REPORT_TYPE_INFO, DEFAULT_TYPE, REPORT_TYPES, init_criterions
+from main.check_packs import BASE_PACKS, BaseCriterionPack, DEFAULT_REPORT_TYPE_INFO, DEFAULT_TYPE, REPORT_TYPES, \
+    init_criterions
 from root_logger import get_logging_stdout_handler, get_root_logger
 from servants import pre_luncher
 from tasks import create_task
@@ -86,7 +86,7 @@ def lti():
         file_type = file_type_info['type']
         formats = sorted((set(map(str.lower, custom_params.get('formats', '').split(','))) & ALLOWED_EXTENSIONS[
             file_type] or ALLOWED_EXTENSIONS[file_type]))
-        
+
         role = utils.get_role(temporary_user_params)
 
         logout_user()
@@ -613,18 +613,19 @@ def version():
 @app.route('/profile/<string:username>', methods=["GET"])
 @login_required
 def profile(username):
-    if current_user.is_admin:
-        if username == '':
-            return redirect(url_for("profile", username=current_user.username))
-        u = db_methods.get_user(username)
-        me = True if username == current_user.username else False
-        if u is not None:
-            return render_template("./profile.html", navi_upload=True, name=current_user.name, user=u, me=me)
-        else:
-            logger.info("Запрошенный пользователь не найден: " + username)
-            return render_template("./404.html")
-    else:
-        abort(403)
+    return abort(404)
+    # if current_user.is_admin:
+    #     if username == '':
+    #         return redirect(url_for("profile", username=current_user.username))
+    #     u = db_methods.get_user(username)
+    #     me = True if username == current_user.username else False
+    #     if u is not None:
+    #         return render_template("./profile.html", navi_upload=True, name=current_user.name, user=u, me=me)
+    #     else:
+    #         logger.info("Запрошенный пользователь не найден: " + username)
+    #         return render_template("./404.html")
+    # else:
+    #     abort(403)
 
 
 @app.route("/capacity", methods=["GET"])
@@ -677,6 +678,7 @@ def add_header(r):
         r.headers['Cache-Control'] = 'public, max-age=0'
     return r
 
+
 class ReverseProxied(object):
     def __init__(self, app):
         self.app = app
@@ -688,6 +690,7 @@ def __call__(self, environ, start_response):
             environ["wsgi.url_scheme"] = "https"
         return self.app(environ, start_response)
 
+
 if __name__ == '__main__':
     DEBUG = True
     if len(argv) == 2:

app/templates/header.html

@@ -1,25 +1,24 @@
 {# Accepts: "navi_upload", "logout" #}
 
 {% if not current_user.is_anonymous %}
-<div class="col-sm-4 col-md-3 col-lg-2 my-auto">
-    {% if navi_upload %}
-    <a class="header-linked text-center" href="/upload" id="upload_ref_link">Загрузить новый файл</a>
-    {% endif %}
-</div>
+    <div class="col-sm-4 col-md-3 col-lg-2 my-auto">
+        {% if navi_upload %}
+            <a class="header-linked text-center" href="/upload" id="upload_ref_link">Загрузить новый файл</a>
+        {% endif %}
+    </div>
 
 
-<div class="offset-sm-4 offset-md-3 offset-lg-2 col-sm-4 col-md-6 col-lg-8 my-auto text-right dropdown">
-    <h5 class="text-right my-auto" id="user_info" data-toggle="dropdown" aria-haspopup="true"
-        aria-expanded="false">{{ current_user.username }}</h5>
-    <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-        <a class="dropdown-item" href="/check_list">Статистика</a>
-        {% if current_user.is_admin %}
-        <a class="dropdown-item" href="/profile">Мой профиль</a>
-        <a class="dropdown-item" href="/criterion_packs">Наборы критериев</a>
-        <a class="dropdown-item" href="/logs">Логи</a>
-        <div class="dropdown-divider"></div>
-        <a class="dropdown-item" href="/version" target="_blank" rel="noopener noreferrer">Version</a>
-        {% endif %}
+    <div class="offset-sm-4 offset-md-3 offset-lg-2 col-sm-4 col-md-6 col-lg-8 my-auto text-right dropdown">
+        <h5 class="text-right my-auto" id="user_info" data-toggle="dropdown" aria-haspopup="true"
+            aria-expanded="false">{{ current_user.username }}</h5>
+        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+            <a class="dropdown-item" href="/check_list">Статистика</a>
+            {% if current_user.is_admin %}
+                <a class="dropdown-item" href="/criterion_packs">Наборы критериев</a>
+                <a class="dropdown-item" href="/logs">Логи</a>
+                <div class="dropdown-divider"></div>
+                <a class="dropdown-item" href="/version" target="_blank" rel="noopener noreferrer">Version</a>
+            {% endif %}
+        </div>
     </div>
-</div>
 {% endif %}