diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html index 2506e6f5f49f8fddd69695fc4e08fee6b2a39079..db22196b3b3298f28044dd091488d76d1c4ee22a 100644 --- a/scipost/templates/scipost/personal_page.html +++ b/scipost/templates/scipost/personal_page.html @@ -62,24 +62,6 @@ $(".TabSection").hide(); $("#AuthorReplies").show(); }); - $("#ListsTab").click(function(){ - $(".TabItem").attr("class", "TabItem inactive"); - $("#ListsTab").attr("class", "TabItem active"); - $(".TabSection").hide(); - $("#Lists").show(); - }); - $("#TeamsTab").click(function(){ - $(".TabItem").attr("class", "TabItem inactive"); - $("#TeamsTab").attr("class", "TabItem active"); - $(".TabSection").hide(); - $("#Teams").show(); - }); - $("#GraphsTab").click(function(){ - $(".TabItem").attr("class", "TabItem inactive"); - $("#GraphsTab").attr("class", "TabItem active"); - $(".TabSection").hide(); - $("#Graphs").show(); - }); }); </script> @@ -119,15 +101,6 @@ <li><a class="TabItem" id="ThesesTab">Theses</a></li> <li><a class="TabItem" id="CommentsTab">Comments</a></li> <li><a class="TabItem" id="AuthorRepliesTab">Author Replies</a></li> - {% if 'Testers' in user_groups %} - <li><a class="TabItem" id="ListsTab">Lists</a></li> - {% endif %} - {% if 'Testers' in user_groups %} - <li><a class="TabItem" id="TeamsTab">Teams</a></li> - {% endif %} - {% if 'Testers' in user_groups %} - <li><a class="TabItem" id="GraphsTab">Graphs</a></li> - {% endif %} </ul> </div> </div> @@ -521,108 +494,6 @@ </div> {% endif %} -<div class="TabSection" id="Lists"> - <div class="row"> - <div class="col-12"> - <div class="panel"> - <h2>Lists</h2> - <ul class="mb-0"> - <li><a href="{% url 'scipost:create_list' %}">Create a new List</a></li> - </ul> - </div> - </div> - </div> - <div class="row"> - <div class="col-12"> - {% if lists_owned %} - <h3>Lists you own:</h3> - <ul> - {% for list in lists_owned %} - {{ list.header_as_li }} - {% endfor %} - </ul> - {% endif %} - {% if lists %} - <h3>Lists to which you have access:</h3> - <ul> - {% for list in lists %} - {{ list.header_as_li }} - {% endfor %} - </ul> - {% endif %} - </div> - </div> -</div> - -<div class="TabSection" id="Teams"> - <div class="row"> - <div class="col-12"> - <div class="panel"> - <h2>Teams</h2> - <ul class="mb-0"> - <li><a href="{% url 'scipost:create_team' %}">Create a new Team</a></li> - </ul> - </div> - </div> - </div> - <div class="row"> - <div class="col-12"> - {% if teams_led %} - <h3>Teams you are leading:</h3> - <ul> - {% for team in teams_led %} - {{ team.header_as_li }} - <a href="{% url 'scipost:add_team_member' team_id=team.id %}">Add a member</a> - {% endfor %} - </ul> - {% endif %} - {% if teams %} - <h3>Teams of which you are a member:</h3> - <ul> - {% for team in teams %} - {{ team.header_as_li }} - {% endfor %} - </ul> - {% endif %} - </div> - </div> -</div> - -<div class="TabSection" id="Graphs"> - <div class="row"> - <div class="col-12"> - <div class="panel"> - <h2>Graphs</h2> - <ul class="mb-0"> - <li><a href="{% url 'scipost:create_graph' %}">Create a new Graph</a></li> - </ul> - </div> - </div> - </div> - <div class="row"> - <div class="col-12"> - - {% if graphs_owned %} - <h3>Graphs you own:</h3> - <ul> - {% for graph in graphs_owned %} - {{ graph.header_as_li }} - {% endfor %} - </ul> - {% endif %} - {% if graphs_private %} - <h3>Private graphs which you can access:</h3> - <ul> - {% for graph in graphs_private %} - {{ graph.header_as_li }} - {% endfor %} - </ul> - {% endif %} - - </div> - </div> -</div> - {% endif %} {% endblock content %} diff --git a/scipost/views.py b/scipost/views.py index 87c6ccdd42defd8a5d964f4ab0962c964e99b1b3..a82d071eda5cc2477e46b744c43159570f52b506 100644 --- a/scipost/views.py +++ b/scipost/views.py @@ -1018,13 +1018,7 @@ def personal_page(request): own_authorreplies = (Comment.objects .filter(author=contributor, is_author_reply=True) .order_by('-date_submitted')) - lists_owned = List.objects.filter(owner=contributor) - lists = List.objects.filter(teams_with_access__members__in=[contributor]) - teams_led = Team.objects.select_related('leader__user').filter(leader=contributor) - teams = Team.objects.select_related('leader__user').filter(members__in=[contributor]) - graphs_owned = Graph.objects.filter(owner=contributor) - graphs_private = Graph.objects.filter(Q(teams_with_access__leader=contributor) - | Q(teams_with_access__members__in=[contributor])) + appellation = title_dict[contributor.title] + ' ' + contributor.user.last_name context = { 'contributor': contributor, @@ -1052,12 +1046,6 @@ def personal_page(request): 'own_commentaries': own_commentaries, 'own_thesislinks': own_thesislinks, 'own_comments': own_comments, 'own_authorreplies': own_authorreplies, - 'lists_owned': lists_owned, - 'lists': lists, - 'teams_led': teams_led, - 'teams': teams, - 'graphs_owned': graphs_owned, - 'graphs_private': graphs_private, } return render(request, 'scipost/personal_page.html', context)