From 3c4cba7d94bc127de9396406a8c9b26f81eefd45 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Fri, 19 May 2017 19:12:09 -0300
Subject: [PATCH] Fixing new staff user unable to access categories list error

---
 amadeus/templates/base.html | 79 +++++++++++++++++++++++++++++++------------------------------------------------
 categories/views.py         |  4 ++--
 2 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index e4474e8..c36ad83 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -108,50 +108,34 @@
                 </div>
 
                 <ul class="nav navbar-nav navbar-right notifications">
-
-
-										<li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}" style="width:40px;">
-
-
-
+					<li class="dropdown language-selector-on-header" title data-original-title="{% trans 'Language Selector' %}" style="width:40px;">
                         <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true">
                             <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
                             <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
                             {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %}
-                            <img src="{% static image_static %}" />
+                                <img src="{% static image_static %}" />
                             {% endwith %}
                         </a>
                         <a href="#" class="dropdown-toggle no-title" data-toggle="dropdown" style="padding-left:0px;padding-right:0px;font-size:14px;text-align:center" data-close-others="true">
-
-                           <span>[{{LANGUAGE_CODE}}]</span>
-
+                            <span>[{{LANGUAGE_CODE}}]</span>
                         </a>
                         <ul class="dropdown-menu">
-
-
                             {% get_available_languages as LANGUAGES %}
                             {% get_language_info_list for LANGUAGES as languages %}
                             {% for language in languages %}
-
-                                <li {% if language.code == LANGUAGE_CODE %}
-                                    class="active"
-                                {% endif %}>
+                                <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
                                     <a class="language-item" value-lang="{{language.code}}">
                                         <span>{{language.code}}</span>
                                     </a>
                                 </li>
-
                             {% endfor %}
                         </ul>
                     </li>
-										<li style="width:40px;">
-											<a href="{% url 'themes:contrast' %}" id="contrast_button">
-													<i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
-											</a>
-
-										</li>
-
-
+					<li style="width:40px;">
+						<a href="{% url 'themes:contrast' %}" id="contrast_button">
+							<i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
+						</a>
+					</li>
                     <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
                         <a href="" data-toggle="dropdown" class="dropdown-toggle profile">
                             <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />
@@ -166,7 +150,7 @@
                         </ul>
                     </li>
 
-                     {% if user.is_staff %}
+                    {% if user.is_staff %}
                         <li id="staff-menu" style="width:40px;" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                                 <i class="fa fa-cog hidden-xs" style="position:relative;right:150%;"aria-hidden="true"></i>
@@ -175,7 +159,7 @@
                             <ul class="dropdown-menu" role="menu">
                                 <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
                                 <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
-																<li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
+								<li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
                                 <li class="dropdown-accordion" data-accordion="#system_accordion">
                                     <div class="panel-group" id="system_accordion">
                                         <div class="panel panel-default">
@@ -205,19 +189,20 @@
                 </ul>
             </div>
         </div>
-				<script type="text/javascript">
-				    $("#contrast_button" ).click(function() {
-				      if (Cookies.get('contrast_check')) {
-				        Cookies.remove('contrast_check')
-				        //location.reload()
-				      }
-				      else {
-				        Cookies.set('contrast_check','contrast')
-				        //location.reload()
-				      }
-
-				    });
-				</script>
+		
+        <script type="text/javascript">
+		    $("#contrast_button" ).click(function() {
+		      if (Cookies.get('contrast_check')) {
+		        Cookies.remove('contrast_check')
+		        //location.reload()
+		      }
+		      else {
+		        Cookies.set('contrast_check','contrast')
+		        //location.reload()
+		      }
+
+		    });
+		</script>
     {% endblock %}
 
     <div class="container-fluid">
@@ -323,16 +308,14 @@
 
     <!-- Language selector code -->
 
-     <script>
-          $(".language-item").click(function(event) {
-
-            change_language.post("{% url 'set_language' %}", {'language': $(this)[0].attributes[1].value, next: "{% url 'users:login' %}", csrfmiddlewaretoken: '{{ csrf_token }}' } );
+    <script>
+      $(".language-item").click(function(event) {
 
-          });
-        </script>
-				<div id="remove_acc">
+        change_language.post("{% url 'set_language' %}", {'language': $(this)[0].attributes[1].value, next: "{% url 'users:login' %}", csrfmiddlewaretoken: '{{ csrf_token }}' } );
 
-				</div>
+      });
+    </script>
+	<div id="remove_acc"></div>
 </body>
 
 </html>
diff --git a/categories/views.py b/categories/views.py
index e6dadc8..19dcd55 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -25,7 +25,7 @@ import time
 from topics.models import Topic, Resource
 from users.models import User
 
-class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView):
+class IndexView(LoginRequiredMixin, views.StaffuserRequiredMixin, ListView):
 
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
@@ -62,7 +62,7 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView):
 
         return context
 
-class CreateCategory(views.SuperuserRequiredMixin, LoginRequiredMixin, HasRoleMixin, LogMixin, CreateView):
+class CreateCategory(LoginRequiredMixin, views.StaffuserRequiredMixin, LogMixin, CreateView):
     log_component = 'category'
     log_action = 'create'
     log_resource = 'category'
--
libgit2 0.21.2