activate selected menu & activate for is_superuser only

Author: agusmakmun

log_viewer/locale/en/LC_MESSAGES/django.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-09 19:54+0700\n"
+"POT-Creation-Date: 2019-07-11 05:22+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -26,18 +26,18 @@ msgstr ""
 msgid "Log Viewer"
 msgstr ""
 
-#: templates/log_viewer/logfile_viewer.html:36
+#: templates/log_viewer/logfile_viewer.html:32
 msgid "Log Files"
 msgstr ""
 
-#: templates/log_viewer/logfile_viewer.html:45
+#: templates/log_viewer/logfile_viewer.html:41
 msgid "No."
 msgstr ""
 
-#: templates/log_viewer/logfile_viewer.html:46
+#: templates/log_viewer/logfile_viewer.html:42
 msgid "Log entries"
 msgstr ""
 
-#: templates/log_viewer/logfile_viewer.html:50
+#: templates/log_viewer/logfile_viewer.html:46
 msgid "No entries!"
 msgstr ""

log_viewer/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-09 19:54+0700\n"
+"POT-Creation-Date: 2019-07-11 05:23+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -26,21 +26,18 @@ msgstr "Beranda"
 msgid "Log Viewer"
 msgstr "Penampil Log"
 
-#: templates/log_viewer/logfile_viewer.html:36
+#: templates/log_viewer/logfile_viewer.html:32
 msgid "Log Files"
 msgstr "File log"
 
-#: templates/log_viewer/logfile_viewer.html:45
+#: templates/log_viewer/logfile_viewer.html:41
 msgid "No."
 msgstr "No."
 
-#: templates/log_viewer/logfile_viewer.html:46
+#: templates/log_viewer/logfile_viewer.html:42
 msgid "Log entries"
 msgstr "Entri log"
 
-#: templates/log_viewer/logfile_viewer.html:50
+#: templates/log_viewer/logfile_viewer.html:46
 msgid "No entries!"
 msgstr "Tidak ada entri!"
-
-#~ msgid "No anything to show !"
-#~ msgstr "Tidak ada sesuatu untuk ditampilkan !"

log_viewer/locale/id/LC_MESSAGES/django.mo

@@ -5,7 +5,7 @@
   <div class="breadcrumbs">
     <a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>
     &rsaquo;
-    <a href="{% url 'log_viewer:log_file_view' %}">{% trans 'Log Viewer' %}</a>
+    <a href="{% url 'log_viewer:log_file_view' %}">{% if custom_file_list_title %}{{ custom_file_list_title }}{% else %}{% trans 'Log Viewer' %}{% endif %}</a>
   </div>
 {% endblock %}
 
@@ -26,10 +26,6 @@
 
 {% block content %}
   <div class="django__log__viewer">
-    {% if custom_file_list_title %}
-      <b>{{ custom_file_list_title }}</b>
-    {% endif %}
-
     <div id="content-main">
       <div class="module filtered" id="changelist">
         <div id="changelist-filter">
@@ -57,7 +53,7 @@ <h2>{% trans 'Log Files' %}</h2>
   </div>
 
   <script>
-    function loadDataTableTrigger(table_name, url_json) {
+    function loadDataTable(table_name, url_json) {
       $(table_name).DataTable({
         pageLength: '{{ page_length }}',
         columns: [{data: 0}, {data: 1}],
@@ -70,7 +66,7 @@ <h2>{% trans 'Log Files' %}</h2>
                 var next_page = response.next_page || 1;
 
                 response.logs.forEach(function(text, numb, logs){
-                  new_logs.push([numb, text])
+                  new_logs.push([numb+1, text])
                 });
 
                 callback({
@@ -84,14 +80,14 @@ <h2>{% trans 'Log Files' %}</h2>
       });
     }
 
-    function loadDataTable(url_json) {
+    function loadDataTableTrigger(url_json) {
       var table_name ='table#log-entries';
       if (!$.fn.dataTable.isDataTable(table_name)) {
-        loadDataTableTrigger(table_name, url_json);
+        loadDataTable(table_name, url_json);
       }else {
         table_dt = $(table_name).DataTable();
         table_dt.destroy();
-        loadDataTableTrigger(table_name, url_json);
+        loadDataTable(table_name, url_json);
       }
     }
 
@@ -114,7 +110,9 @@ <h2>{% trans 'Log Files' %}</h2>
 
     $(document).on('click', '.btn-load-json-log', function(){
         // console.log(this);
-        loadDataTable($(this).data('href'));
+        $(this).closest('#log-files-list').find('li').removeClass('selected');
+        $(this).closest('li').addClass('selected');
+        loadDataTableTrigger($(this).data('href'));
     });
   </script>
 {% endblock%}

log_viewer/locale/id/LC_MESSAGES/django.po

@@ -5,7 +5,7 @@
 from itertools import islice
 from django.http import HttpResponse
 from django.views.generic import TemplateView
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import (login_required, user_passes_test)
 from django.contrib.admin.utils import (quote, unquote)
 from django.utils.decorators import method_decorator
 
@@ -16,6 +16,7 @@
 class LogJsonView(JSONResponseMixin, TemplateView):
 
     @method_decorator(login_required)
+    @method_decorator(user_passes_test(lambda u: u.is_superuser))
     def dispatch(self, *args, **kwargs):
         return super(LogJsonView, self).dispatch(*args, **kwargs)
 
@@ -60,7 +61,8 @@ def get_log_json(self, file_name=None, page=1):
 
         if file_name:
             try:
-                with open(os.path.join(settings.LOG_VIEWER_FILES_DIR, file_name), encoding='utf8', errors='ignore') as file:
+                file_log = os.path.join(settings.LOG_VIEWER_FILES_DIR, file_name)
+                with open(file_log, encoding='utf8', errors='ignore') as file:
                     next_lines = list(islice(readlines_reverse(file, exclude='Not Found'),
                                              (page - 1) * lines_per_page,
                                              page * lines_per_page))
@@ -109,6 +111,7 @@ class LogViewerView(TemplateView):
     template_name = "log_viewer/logfile_viewer.html"
 
     @method_decorator(login_required)
+    @method_decorator(user_passes_test(lambda u: u.is_superuser))
     def dispatch(self, *args, **kwargs):
         return super(LogViewerView, self).dispatch(*args, **kwargs)
 

log_viewer/templates/log_viewer/logfile_viewer.html

@@ -3,7 +3,7 @@
 
 from setuptools import (setup, find_packages)
 
-__version__ = '1.0.4'
+__version__ = '1.0.5'
 
 setup(
     name='django-log-viewer',