Merge pull request #2 from mintcoding/working

working to compliance_mgt
Djandwich · Feb 9, 2021 · 5ddbc54 · 5ddbc54
2 parents bf48d7f + 8944f1c
commit 5ddbc54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/wildlifecompliance/components/main/views.py b/wildlifecompliance/components/main/views.py
@@ -37,10 +37,10 @@ def get(self, request, format=None):
 class SystemPreferenceView(views.APIView):
     def get(self, request, format=None):
         res = { "system": "wildlife_licensing" }
-        # if request.user.is_authenticated():
-        #     preference_qs, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user=request.user)
-        #     if preference_qs and preference_qs.prefer_compliance_management and is_compliance_management_readonly_user(request):
-        #         res = { "system": "compliance_management" }
+        if request.user.is_authenticated():
+            preference_qs, created = ComplianceManagementUserPreferences.objects.get_or_create(email_user=request.user)
+            if preference_qs and preference_qs.prefer_compliance_management and is_compliance_management_readonly_user(request):
+                res = { "system": "compliance_management" }
         return Response(res)
 
 

diff --git a/wildlifecompliance/templates/wildlifecompliance/base.html b/wildlifecompliance/templates/wildlifecompliance/base.html
@@ -82,7 +82,7 @@
                                         {% else %}
                                             <!-- External user -->
                                             <a class="navbar-brand" href="/external/"><div style="inline"><img src="{% static 'wildlifecompliance/img/dpaw_small.png' %}">Home</div></a>
-                                            <!-- <li><a href="/external/sanction_outcome">Sanction Outcome</a></li> -->
+                                            <li><a href="/external/sanction_outcome">Sanction Outcome</a></li>
                                         {% endif %}
 
                                         {% if is_officer_login %}
@@ -114,11 +114,11 @@
                                             </a>
                                             <ul class="dropdown-menu">
                                                 {% if is_internal_login and is_compliance_management_readonly_user and not prefer_compliance_management %}
-                                                    <!-- <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
+                                                    <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">
                                                         {% csrf_token %}
                                                         <input type="hidden" name="prefer_compliance_management" value="True"/>
                                                         <input type="submit" class="submit" value="Show Compliance Management" />
-                                                    </form> -->
+                                                    </form>
                                                 <li role="separator" class="divider"></li>
                                                 {% elif is_compliance_internal_login and prefer_compliance_management %}
                                                     <form name="update-system-preference" method="post" action="/api/users/{{request.user.id}}/update_system_preference/">