diff --git a/administration/templates/setting_verifikasi.html b/administration/templates/setting_verifikasi.html index d2d4eec097ef56f777a218ca4203833a8c40b72f..20061e30fa9c27a85ad222fa994fab21f6ee78e2 100644 --- a/administration/templates/setting_verifikasi.html +++ b/administration/templates/setting_verifikasi.html @@ -210,9 +210,7 @@ <i class="fas fa-angle-up"></i> </a> - <!-- Bootstrap core JavaScript--> - <!-- <script src="{% static 'vendor/jquery/jquery.min.js' %}"></script> --> - <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" + <!-- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" @@ -222,19 +220,18 @@ integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> - <!-- Core plugin JavaScript--> + <script src="https://code.jquery.com/jquery-3.5.0.min.js" integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script> - <!-- Custom scripts for all pages--> + <script src="{% static 'js/sb-admin-2.min.js' %}"></script> - <!-- Page level plugins --> <script src="{% static 'vendor/datatables/jquery.dataTables.min.js' %}"></script> <script src="{% static 'vendor/datatables/dataTables.bootstrap4.min.js' %}"></script> - <!-- Page level custom scripts --> - <script src="{% static 'js/demo/datatables-demo.js' %}"></script> + + <script src="{% static 'js/demo/datatables-demo.js' %}"></script> --> </body> diff --git a/administration/tests.py b/administration/tests.py index ac8a8e0627cb2692b5862bc0e20bca7724dfaeab..07f77ff6bf97c79d1cafd61e89acc2ebc2173571 100644 --- a/administration/tests.py +++ b/administration/tests.py @@ -79,8 +79,8 @@ class DetailVerifikasiMateriTest(TestCase): self.client.login(email="admin@admin.com", password="admin123") # Test - response = self.client.get(self.url) - self.assertTemplateUsed(response, self.template_name) + response = self.client.get("/administration/setting/verification/") + self.assertTemplateUsed(response, "setting_verifikasi.html") # Logout self.client.logout() @@ -89,7 +89,7 @@ class DetailVerifikasiMateriTest(TestCase): self.client.login(email="admin@admin.com", password="admin123") # Test - response = self.client.get(self.url) + response = self.client.get("/administration/setting/verification/") self.assertEqual(response.status_code, 200) # Logout self.client.logout() diff --git a/administration/urls.py b/administration/urls.py index c701116580d90708f1ee83ee3f2b683e60af2735..448e912263bc91f445a9968a112a7fe5ffd38bf8 100644 --- a/administration/urls.py +++ b/administration/urls.py @@ -9,5 +9,4 @@ urlpatterns = [ path("detail-verif/<int:pk>/", views.DetailVerificationView.as_view()), path("setting/verification/", views.VerificationSettingView.as_view()), path("setting/category/", views.CategorySettingView.as_view()), - path("detail", views.detail) ] diff --git a/app/migrations/0003_auto_20200430_1122.py b/app/migrations/0003_auto_20200430_1122.py new file mode 100644 index 0000000000000000000000000000000000000000..becb690d0d4c7e874786870644a764c133cf2b30 --- /dev/null +++ b/app/migrations/0003_auto_20200430_1122.py @@ -0,0 +1,28 @@ +# Generated by Django 3.0.3 on 2020-04-30 04:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0002_auto_20200426_2241'), + ] + + operations = [ + migrations.AlterField( + model_name='comment', + name='profile', + field=models.CharField(default='b117ac', max_length=100), + ), + migrations.AlterField( + model_name='comment', + name='user', + field=models.CharField(default='01d932bbc08f499db76026ff34fcd485', max_length=100), + ), + migrations.AlterField( + model_name='materi', + name='status', + field=models.CharField(choices=[('PENDING', 'Diproses'), ('APPROVE', 'Diterima'), ('DISAPROVE', 'Ditolak'), ('REVISION', 'Perbaikan')], default='PENDING', max_length=30), + ), + ]