Commit 97e4e5c8290e8b86db87e2c7a96eddfc70103664
1 parent
85a887fd
Exists in
master
and in
5 other branches
Adding courses accordion to menu. [Issues: #44 and #45]
Showing
3 changed files
with
29 additions
and
4 deletions
Show diff stats
amadeus/settings.py
| @@ -79,6 +79,7 @@ TEMPLATES = [ | @@ -79,6 +79,7 @@ TEMPLATES = [ | ||
| 79 | 'django.contrib.messages.context_processors.messages', | 79 | 'django.contrib.messages.context_processors.messages', |
| 80 | 80 | ||
| 81 | 'core.context_processors.notifications', | 81 | 'core.context_processors.notifications', |
| 82 | + 'courses.context_processors.courses', | ||
| 82 | ], | 83 | ], |
| 83 | }, | 84 | }, |
| 84 | }, | 85 | }, |
| @@ -94,8 +95,8 @@ DATABASES = { | @@ -94,8 +95,8 @@ DATABASES = { | ||
| 94 | 'default': { | 95 | 'default': { |
| 95 | 'ENGINE': 'django.db.backends.postgresql', | 96 | 'ENGINE': 'django.db.backends.postgresql', |
| 96 | 'NAME': 'amadeus', | 97 | 'NAME': 'amadeus', |
| 97 | - 'USER': 'postgres', | ||
| 98 | - 'PASSWORD': 'felipe', | 98 | + 'USER': 'amadeus_admin', |
| 99 | + 'PASSWORD': 'amadeus', | ||
| 99 | 'HOST': '127.0.0.1', | 100 | 'HOST': '127.0.0.1', |
| 100 | 'PORT': '5432', | 101 | 'PORT': '5432', |
| 101 | } | 102 | } |
app/templates/home.html
| @@ -86,14 +86,24 @@ | @@ -86,14 +86,24 @@ | ||
| 86 | <li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li> | 86 | <li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li> |
| 87 | <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li> | 87 | <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li> |
| 88 | <li> <a href="#">{% trans 'Pending Tasks' %}</a></li> | 88 | <li> <a href="#">{% trans 'Pending Tasks' %}</a></li> |
| 89 | - {% if user|has_role:'student' %} | 89 | + {% if user|has_role:'student' and not user.is_staff %} |
| 90 | <li> <a href="#">{% trans 'My courses' %}</a></li> | 90 | <li> <a href="#">{% trans 'My courses' %}</a></li> |
| 91 | {% endif %} | 91 | {% endif %} |
| 92 | {% if user|has_role:'system_admin' %} | 92 | {% if user|has_role:'system_admin' %} |
| 93 | <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> | 93 | <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li> |
| 94 | {% endif %} | 94 | {% endif %} |
| 95 | {% if user|has_role:'system_admin, professor' %} | 95 | {% if user|has_role:'system_admin, professor' %} |
| 96 | - <li> <a href="{% url 'course:manage' %}">{% trans 'Manage Courses' %}</a></li> | 96 | + <li> |
| 97 | + <a href="#courses_list" data-toggle="collapse">{% trans 'Manage Courses' %}</a> | ||
| 98 | + | ||
| 99 | + <div id="courses_list" class="collapse"> | ||
| 100 | + <ul class="nav nav-pill nav-stacked"> | ||
| 101 | + {% for course in courses_list %} | ||
| 102 | + <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li> | ||
| 103 | + {% endfor %} | ||
| 104 | + </ul> | ||
| 105 | + </div> | ||
| 106 | + </li> | ||
| 97 | {% endif %} | 107 | {% endif %} |
| 98 | </ul> | 108 | </ul> |
| 99 | </div> | 109 | </div> |
| @@ -0,0 +1,14 @@ | @@ -0,0 +1,14 @@ | ||
| 1 | +from .models import Course | ||
| 2 | + | ||
| 3 | +def courses(request): | ||
| 4 | + if request.user.is_authenticated: | ||
| 5 | + context = {} | ||
| 6 | + | ||
| 7 | + if request.user.is_staff: | ||
| 8 | + context['courses_list'] = Course.objects.all() | ||
| 9 | + else: | ||
| 10 | + context['courses_list'] = Course.objects.filter(professors__in = [request.user]) | ||
| 11 | + | ||
| 12 | + return context | ||
| 13 | + else: | ||
| 14 | + return request | ||
| 0 | \ No newline at end of file | 15 | \ No newline at end of file |