DATABASES/madrigal Commit - r18:5a8055e18e7b

Add BASE_URL in settings to work with proxys

jespinoza -

r18:5a8055e18e7b

parent child

Context file:

r18:5a8055e18e7b

source/madpy/djangoMad/apps/updata/views.py +2 -1

             from django.contrib.auth.decorators import login_required
             from django.shortcuts import render
             from apps.updata.forms import UpdataForm, ExpForm
             from django.core.files.storage import FileSystemStorage
             from django.contrib import messages
+            from django.conf import settings
             import os
             import glob
             import datetime
             # madrigal imports
             import madrigal.metadata
             import madrigal.ui.web
             import madrigal.admin
-            @login_required(login_url='/madrigal/accounts/login/')
+            @login_required(login_url='/{}/accounts/login/'.format(settings.BASE_URL))
             def index(request):
                 '''
                 Uploading experiments data view. Allows user to upload experiment files
                 '''
                 dbAdminObj = madrigal.admin.MadrigalDBAdmin()
                 madDB = madrigal.metadata.MadrigalDB()
                 madWebObj = madrigal.ui.web.MadrigalWeb(madDB)
                 madMeta = madrigal.metadata.MadrigalInstrument(madDB)
                 siteName, siteList = madWebObj.getSiteInfo()
                 err = False
                 if request.method == 'POST':
                     for root, folders, tmp_files in os.walk('/madrigal/experiments/tmp/'):
                         for f in tmp_files:
                             os.remove(os.path.join(root, f))
                     form = UpdataForm(request.POST, request.FILES)
                     files = request.FILES.getlist('file')
                     # files.sort()
                     filenames = []
                     choose = request.POST.get('choose')
                     if choose == 'new':
                         instCode = int(request.POST.get('inst'))
                         expTitle = request.POST.get('exp')
                     else:
                         instCode = int(request.POST.get('instruments'))
                         expId = request.POST.get('experiments')
                         madExp = madrigal.metadata.MadrigalExperiment()
                         expTitle = madExp.getExpNameByExpId(expId)
                     description = request.POST.get('description')
                     perm = int(request.POST.get('permission'))
                     optchar = request.POST.get('optchar').strip()
                     category = int(request.POST.get('category'))
                     first = True
                     if len(files) == 1:
                         fs = FileSystemStorage(location='/madrigal/experiments/tmp')
                         fs.save(files[0].name, files[0])
                         filename = os.path.join('/madrigal/experiments/tmp', files[0].name)
                         fileInfo = madrigal.data.MadrigalFile(filename, madDB)
                         sTime = fileInfo.getEarliestTime()
                         startTime = datetime.datetime(sTime[0],sTime[1],sTime[2],sTime[3],sTime[4],sTime[5])
                         exp_list = madWebObj.getExpsOnDate(instCode, startTime.year, startTime.month, startTime.day)
                         ext = filename.split('.')[-1]
                         if ext not in ('hdf5', 'h5'):
                             convert = True
                         else:
                             convert = False
                         expDir = os.path.join('/madrigal/experiments/', startTime.strftime('%Y'), madMeta.getInstrumentMnemonic(instCode), startTime.strftime('%d%b%y').lower())
                         if os.path.exists(expDir):
                             #expDir = exp_list[0][2]
                             try:
                                 if category==1 and os.path.exists(os.path.join(expDir, files[0].name)):
                                     dbAdminObj.overwriteMadrigalFile(expDir, filename, notify=True)
                                     messages.warning(request,
                                         'Filename {} has been overwritten'.format(files[0].name)
                                     )
                                 else:
                                     dbAdminObj.addMadrigalFile(expDir, filename, perm, description, category=category, updateToMad3=convert)
                                     messages.warning(request,
                                         'Filename {} has been added with category={}'.format(files[0].name, category)
                                     )
                             except Exception as e:
                                 err = True
                                 messages.error(request,
                                     'An error occur adding file {}: {}'.format(filename.split('/')[-1], e)
                                     )
                         else:
                             if os.path.exists(os.path.join('/madrigal/experiments/tmp', 'overview', files[0].name + '.summary')):
                                 os.remove(os.path.join('/madrigal/experiments/tmp', 'overview', files[0].name + '.summary'))
                             try:
                                 expDir = dbAdminObj.createMadrigalExperiment(filename, expTitle, perm, description,
                                     instCode, category=category, optChar=optchar, updateToMad3=convert)
                             except Exception as e:
                                 err = True
                                 messages.error(request,
                                     'An error occur creating the experiment {}: {}'.format(expTitle, e)
                                     )
                         filenames.append(filename.split('/')[-1])
                     else:
                         for f in files:
                             fs = FileSystemStorage(location='/madrigal/experiments/tmp')
                             fs.save(f.name, f)
                             filename = os.path.join('/madrigal/experiments/tmp', f.name)
                             ext = filename.split('.')[-1]
                             if ext not in ('hdf5', 'h5'):
                                 convert = True
                             else:
                                 convert = False
                             if first:
                                 first = False
                                 try:
                                     expDir = dbAdminObj.createMadrigalExperiment(filename, expTitle, perm, description,
                                         instCode, category=category, optChar=optchar, updateToMad3=convert)
                                 except Exception as e:
                                     err = True
                                     messages.error(request,
                                         'An error occur creating the experiment {}: {}'.format(expTitle, e)
                                         )
                                     break
                             else:
                                 try:
                                     dbAdminObj.addMadrigalFile(expDir, filename, perm, description, category=category, updateToMad3=convert)
                                 except Exception as e:
                                     err = True
                                     messages.error(request,
                                         'An error occur adding file {}: {}'.format(filename.split('/')[-1], e)
                                         )
                             filenames.append(filename.split('/')[-1])
                             os.remove(filename)
                     if not err:
                         messages.success(request,
                             'Experiment {} created succesfully with files: {}'.format(expTitle, filenames)
                         )
                         madInstParams = madrigal.metadata.MadrigalInstrumentParameters()
                         madInstKindats = madrigal.metadata.MadrigalInstrumentKindats()
                         print('*** Updating local metadata ***')
                         dbAdminObj.__updateLocalMetadata__()
                         print('*** Rebuilding instParmTab.txt ***')
                         madInstParams.rebuildInstParmTable()
                         print('*** Rebuilding instKindatTab.txt ***')
                         madInstKindats.rebuildInstKindatTable()
                         form = UpdataForm()
                 else:
                     form = UpdataForm()
                 return render(request, 'updata/index.html', {
                     'form': form,
                     'site_name': siteName,
                     'site_list': siteList,
                 })
             def get_experiments(request):
                 """get_experiments is a Ajax call that returns the experiments select html to support the
                 updata UI.  Called when a user modifies the intruments select field.
                 Inputs:
                     request
                 """
                 form = ExpForm(request.GET)
                 return render(request, 'updata/experiments.html', {'form': form})

source/madpy/djangoMad/djangoMad/settings.py +2 0

             """
             Django settings for djangoMad project.
             For more information on this file, see
             https://docs.djangoproject.com/en/1.7/topics/settings/
             For the full list of settings and their values, see
             https://docs.djangoproject.com/en/1.7/ref/settings/
             """
             # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
             import os
             BASE_DIR = os.path.dirname(os.path.dirname(__file__))
             # Quick-start development settings - unsuitable for production
             # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
             # SECURITY WARNING: keep the secret key used in production secret!
             SECRET_KEY = '^c1l3d35+q28^66d2pc1qlu(k$wmw^*gg3rfitz^s)t=9eu1ui'
             # SECURITY WARNING: don't run with debug turned on in production!
             DEBUG = True
             ALLOWED_HOSTS = ['localhost:8000', '127.0.0.1', 'localhost', '10.10.120.60']
             ADMINS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
             EMAIL_HOST = 'hyperion.haystack.mit.edu'
             SEND_BROKEN_LINK_EMAILS = True
             MANAGERS = (('Bill Rideout', 'brideout@haystack.mit.edu'),)
             # Application definition
             INSTALLED_APPS = (
                 'django.contrib.admin',
                 'django.contrib.auth',
                 'django.contrib.contenttypes',
                 'django.contrib.sessions',
                 'django.contrib.messages',
                 'django.contrib.staticfiles',
                 'madweb',
                 'django_bootstrap_calendar',
                 'bootstrap3',
                 'apps.login',
                 'apps.updata',
             )
             MIDDLEWARE = [
                 'django.middleware.security.SecurityMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 'django.middleware.common.CommonMiddleware',
                 'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
                 'django.contrib.messages.middleware.MessageMiddleware',
                 'django.middleware.clickjacking.XFrameOptionsMiddleware',
             ]
             ROOT_URLCONF = 'djangoMad.urls'
             WSGI_APPLICATION = 'djangoMad.wsgi.application'
             TEMPLATES = [
                 {
                     'BACKEND': 'django.template.backends.django.DjangoTemplates',
                     'DIRS': [
                         os.path.join(BASE_DIR, "templates"),
                     ],
                     'APP_DIRS': True,
                     'OPTIONS': {
                         'context_processors': [
                             'django.contrib.auth.context_processors.auth',
                             'django.template.context_processors.debug',
                             'django.template.context_processors.i18n',
                             'django.template.context_processors.media',
                             'django.template.context_processors.static',
                             'django.template.context_processors.tz',
                             'django.contrib.messages.context_processors.messages',
                             'django.template.context_processors.request',
                         ],
                     },
                 },
             ]
             # Database
             # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
             DATABASES = {
                 'default': {
                     'ENGINE': 'django.db.backends.sqlite3',
                     'NAME': 'madrigal.sqlite',
                 }
             }
             # Internationalization
             # https://docs.djangoproject.com/en/1.7/topics/i18n/
             LANGUAGE_CODE = 'en-us'
             TIME_ZONE = 'UTC'
             USE_I18N = True
             USE_L10N = True
             USE_TZ = True
             # Absolute filesystem path to the directory that will hold user-uploaded files.
             # Example: "/home/media/media.lawrence.com/media/"
             MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
             # URL that handles the media served from MEDIA_ROOT. Make sure to use a
             # trailing slash.
             # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
             MEDIA_URL = '/media/'
             # Absolute path to the directory static files should be collected to.
             # Don't put anything in this directory yourself; store your static files
             # in apps' "static/" subdirectories and in STATICFILES_DIRS.
             # Example: "/home/media/media.lawrence.com/static/"
             # STATIC_ROOT = os.path.join(BASE_DIR, 'static')
             # URL prefix for static files.
             # Example: "http://media.lawrence.com/static/"
             STATIC_URL = '/madrigal/static/'
             STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
+            BASE_URL = 'madrigal'
+            #BASE_URL = 'observatorios/radio-observatorio-jicamarca/madrigal'
             BOOTSTRAP3 = {
                 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
                 'jquery_url': '/madrigal/static/jquery.min.js',
                 'include_jquery': True,
             }

source/madpy/djangoMad/djangoMad/urls.py +12 -6

@@ -1,12 +1,18
1	from django.conf.urls import include, url	1	from django.conf.urls import include, url
2	from django.contrib import admin	2	from django.contrib import admin
		3	from django.conf import settings
3	import madweb.views	4	import madweb.views
4		5
		6	if settings.BASE_URL:
		7	base = settings.BASE_URL + '/'
		8	else:
		9	base = ''
		10
5	urlpatterns = [	11	urlpatterns = [
6	url(r'^~~madrigal/~~', include('madweb.urls')),	12	url(r'^{}'.format(base), include('madweb.urls')),
7	url(r'^$', madweb.views.index),	13	# url(r'^$', madweb.views.index),
8	url(r'^~~madrigal/~~updata/', include('apps.updata.urls', namespace="updata")),	14	url(r'^{}updata/'.format(base), include('apps.updata.urls', namespace="updata")),
9	url(r'^~~madrigal/~~accounts/', include('apps.login.urls', namespace="login")),	15	url(r'^{}accounts/'.format(base), include('apps.login.urls', namespace="login")),
10	url(r'^~~madrigal/~~admin/', admin.site.urls),	16	url(r'^{}admin/'.format(base), admin.site.urls),
11	# url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),	17	# url(r'^madrigal/register/?$', madweb.views.view_registration, name='view_registration'),
12	]	18	]

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages