From 4f88a1f1a3d4a1d6f7b2fd64eefb50eb55b122d4 Mon Sep 17 00:00:00 2001 From: andis Date: Fri, 14 Aug 2020 20:42:01 +0000 Subject: [PATCH] delete document test --- fet2020/documents/__init__.py | 12 ---- fet2020/documents/admin.py | 23 ------ fet2020/documents/apps.py | 7 -- fet2020/documents/migrations/__init__.py | 0 fet2020/documents/models.py | 8 --- fet2020/documents/tests.py | 3 - fet2020/documents/urls.py | 6 -- fet2020/documents/views.py | 91 ------------------------ fet2020/fet2020/settings.py | 1 - fet2020/fet2020/urls.py | 3 +- 10 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 fet2020/documents/__init__.py delete mode 100644 fet2020/documents/admin.py delete mode 100644 fet2020/documents/apps.py delete mode 100644 fet2020/documents/migrations/__init__.py delete mode 100644 fet2020/documents/models.py delete mode 100644 fet2020/documents/tests.py delete mode 100644 fet2020/documents/urls.py delete mode 100644 fet2020/documents/views.py diff --git a/fet2020/documents/__init__.py b/fet2020/documents/__init__.py deleted file mode 100644 index ae69a266..00000000 --- a/fet2020/documents/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from etherpad_lite import EtherpadLiteClient -from django.conf import settings -from datetime import datetime, timedelta - -t=datetime.now() + timedelta(days=1) - -with open("/srv/andis_test/etherpad-lite/etherpad-lite/APIKEY.txt","r") as f: - k=f.read() - epc=EtherpadLiteClient( base_params={'apikey':k,}, base_url="http://localhost:9001/api") - a=epc.createAuthorIfNotExistsFor(name="andis", authorMapper="andis") - g=epc.createGroupIfNotExistsFor(groupMapper="fet") - diff --git a/fet2020/documents/admin.py b/fet2020/documents/admin.py deleted file mode 100644 index e7e1916d..00000000 --- a/fet2020/documents/admin.py +++ /dev/null @@ -1,23 +0,0 @@ -from django.contrib import admin -from .models import Document -from django.urls import path -from django.contrib.auth import views as auth_views -from django.shortcuts import render - - -@admin.register(Document) -class DocumentModelAdmin(admin.ModelAdmin): - def my_view(self,request, extra_context=None): - return render(request,"admin/documents/preview.html") - - def get_urls(self): - urls = super().get_urls() - select_list_url = [ path("/preview", self.admin_site.admin_view(self.my_view), - name='preview'), - path("preview", self.admin_site.admin_view(self.my_view), - name='preview') - - ] - return select_list_url #+ urls - -#admin.site.register(Document,DocumentModelAdmin) diff --git a/fet2020/documents/apps.py b/fet2020/documents/apps.py deleted file mode 100644 index 4cf9904d..00000000 --- a/fet2020/documents/apps.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.apps import AppConfig - - -class DocumentsConfig(AppConfig): - name = 'documents' -from django.contrib.admin.apps import AdminConfig - diff --git a/fet2020/documents/migrations/__init__.py b/fet2020/documents/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/fet2020/documents/models.py b/fet2020/documents/models.py deleted file mode 100644 index bdfa2db8..00000000 --- a/fet2020/documents/models.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.db import models - -# Create your models here. -class Document(models.Model): - key = models.CharField(max_length=200, primary_key=True) - - - diff --git a/fet2020/documents/tests.py b/fet2020/documents/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/fet2020/documents/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/fet2020/documents/urls.py b/fet2020/documents/urls.py deleted file mode 100644 index 3bb2a3a6..00000000 --- a/fet2020/documents/urls.py +++ /dev/null @@ -1,6 +0,0 @@ -import documents.views as views -from django.urls import path - -urlpatterns=[ - path("document/", views.document) -] \ No newline at end of file diff --git a/fet2020/documents/views.py b/fet2020/documents/views.py deleted file mode 100644 index dd61aa26..00000000 --- a/fet2020/documents/views.py +++ /dev/null @@ -1,91 +0,0 @@ -from django.shortcuts import render - -# Create your views here. - - -from django.http import HttpResponseRedirect -from django.template import RequestContext -from django.contrib.auth.decorators import login_required -from django.utils.translation import ugettext_lazy as _ -import urllib -from urllib.parse import urlparse -from .models import Document -from documents import epc -from documents import g as group -SERVER_URL="http://etherpad.2020.fet.at/" - -import datetime -@login_required -def document(request, id=None): - """Create and session and display an embedded pad - """ - - # Initialize some needed values - #pad = Document.objects.get(key=id) - padID=id - padLink = SERVER_URL + 'p/' + group["groupID"] + '$' + \ - padID - server = urlparse(SERVER_URL) - author = epc.createAuthorIfNotExistsFor(name=str(request.user), authorMapper=str(request.user))['authorID'] - - - # Create the session on the etherpad-lite side - expires = datetime.datetime.utcnow() + datetime.timedelta( - hours=3 - ) - epclient = epc - - try: - result = epclient.createSession( - groupID=str(group['groupID']), - authorID=str(author), - validUntil=str(int(expires.timestamp())) - ) - except Exception as e: - response = render( - 'etherpad-lite/pad.html', - { - 'pad': padID, - 'link': padLink, - 'server': str(server), - 'uname': str(request.user), - 'error': 'etherpad-lite session request returned:' + - '"' + str(e) + '"' - } - - ) - return response - - # Set up the response - response = render(request, - 'documents/pad.html', - { - 'pad': padID, - 'link': padLink, - 'server': str(server), - 'uname': str(request.user), - 'error': False - }#, context=(request) - ) - - # Delete the existing session first - if ('padSessionID' in request.COOKIES): - epclient.deleteSession(request.COOKIES['sessionID']) - response.delete_cookie('sessionID', server.hostname) - response.delete_cookie('padSessionID') - - # Set the new session cookie for both the server and the local site - response.set_cookie( - 'sessionID', - value=result['sessionID'], - expires=expires, - domain=server.hostname, - httponly=False - ) - response.set_cookie( - 'padSessionID', - value=result['sessionID'], - expires=expires, - httponly=False - ) - return response \ No newline at end of file diff --git a/fet2020/fet2020/settings.py b/fet2020/fet2020/settings.py index 06d273d8..ca13e1f7 100644 --- a/fet2020/fet2020/settings.py +++ b/fet2020/fet2020/settings.py @@ -35,7 +35,6 @@ CKEDITOR_UPLOAD_PATH = 'upload' INSTALLED_APPS = [ 'posts.apps.PostsConfig', 'members.apps.MembersConfig', - 'documents.apps.DocumentsConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index f9ab1f0a..e5e4cb3c 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -28,8 +28,7 @@ router.register(r'members', MemberViewSet) urlpatterns = [ path('posts/', include('posts.urls')), - path('documents/', include('documents.urls')), - path('admin/doc/', include('django.contrib.admindocs.urls')), + path('admin/doc/', include('django.contrib.admindocs.urls')), path('admin/', admin.site.urls), path('', views.index, name='home'), path('index.html', views.index, name='home'),