Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/warpinfra
  • dray/warpinfra
  • HoelShare/warpinfra
3 results
Show changes
from django.test import TestCase
# Create your tests here.
from django.conf.urls import url, include
from warpservice import views
urlpatterns = [
url(r'^api/services/3dprinter$', views.printer_3d),
]
from rest_framework.decorators import api_view
from rest_framework.response import Response
from rest_framework import status
from warpauth.models import LdapUser
@api_view(['GET'])
def printer_3d(request):
ret= {"admin":{}, "user":{}}
users = LdapUser.objects.filter(memberof__contains="cn=3dprint-user,ou=infrastructure,dc=warpzone,dc=ms").filter(memberof__contains="cn=active,ou=groups,dc=warpzone,dc=ms")
for user in users:
if user.card_id:
ret["user"][user.card_id] = user.uid
return Response(ret)
......@@ -52,10 +52,11 @@ SECRET_KEY = config.get('security','SECRET_KEY')
API_KEY = config.get('mattermost','API_KEY')
# DEBUG
DEBUG = config.getboolean('debug','DEBUG')
DEBUG = config.getboolean('debug', 'DEBUG')
# MISC
LOG_PATH = config.get('misc','LOG_PATH')
LOG_PATH = config.get('misc', 'LOG_PATH')
INSTANCE_NAME = config.get('common', 'INSTANCE_NAME')
ALLOWED_HOSTS = [config.get('security','ALLOWED_HOSTS')]
......
......@@ -5,7 +5,8 @@ from django.conf import settings
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, }),
url(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': settings.MEDIA_ROOT, }),
]
if "warpmain" in settings.INSTALLED_APPS:
......@@ -22,3 +23,6 @@ if "warpapi" in settings.INSTALLED_APPS:
if "warppay" in settings.INSTALLED_APPS:
urlpatterns.append(url(r'^', include('warppay.urls')))
if "warpservice" in settings.INSTALLED_APPS:
urlpatterns.append(url(r'^', include('warpservice.urls')))