Remove Test watermark from interim meeting index background. Commit ready for merge
- Legacy-Id: 10724
This commit is contained in:
Ryan Cross
parent
e97cd64bbb
commit
8efb9229f6
|
|
@ -10,6 +10,7 @@ import os
|
|||
import shutil
|
||||
|
||||
from django.conf import settings
|
||||
from django.http import HttpRequest
|
||||
from django.shortcuts import render_to_response, render
|
||||
|
||||
from ietf.doc.models import Document, RelatedDocument, DocEvent, NewRevisionDocEvent, State
|
||||
|
|
@ -32,9 +33,9 @@ def check_audio_files(group,meeting):
|
|||
'''
|
||||
Checks for audio files and creates corresponding materials (docs) for the Session
|
||||
Expects audio files in the format ietf[meeting num]-[room]-YYYMMDD-HHMM-*,
|
||||
|
||||
|
||||
Example: ietf90-salonb-20140721-1710-pm3.mp3
|
||||
|
||||
|
||||
'''
|
||||
for session in Session.objects.filter(group=group,meeting=meeting,status__in=('sched','schedw')):
|
||||
try:
|
||||
|
|
@ -68,7 +69,7 @@ def create_recording(session,meeting,group,url):
|
|||
title = 'Audio recording for {}'.format(time)
|
||||
else:
|
||||
title = 'Video recording for {}'.format(time)
|
||||
|
||||
|
||||
doc = Document.objects.create(name=name,
|
||||
title=title,
|
||||
external_url=url,
|
||||
|
|
@ -76,7 +77,7 @@ def create_recording(session,meeting,group,url):
|
|||
rev='00',
|
||||
type_id='recording')
|
||||
doc.set_state(State.objects.get(type='recording', slug='active'))
|
||||
|
||||
|
||||
# create DocEvent
|
||||
NewRevisionDocEvent.objects.create(type='new_revision',
|
||||
by=Person.objects.get(name='(System)'),
|
||||
|
|
@ -213,7 +214,7 @@ def write_html(path,content):
|
|||
# End Helper Functions
|
||||
# -------------------------------------------------
|
||||
|
||||
def create_interim_directory(request):
|
||||
def create_interim_directory():
|
||||
'''
|
||||
Create static Interim Meeting directory pages that will live in a different URL space than
|
||||
the secretariat Django project
|
||||
|
|
@ -222,7 +223,7 @@ def create_interim_directory(request):
|
|||
# produce date sorted output
|
||||
page = 'proceedings.html'
|
||||
meetings = InterimMeeting.objects.order_by('-date')
|
||||
response = render(request, 'proceedings/interim_directory.html',{'meetings': meetings})
|
||||
response = render(HttpRequest(), 'proceedings/interim_directory.html',{'meetings': meetings})
|
||||
path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
|
||||
f = open(path,'w')
|
||||
f.write(response.content)
|
||||
|
|
@ -232,7 +233,7 @@ def create_interim_directory(request):
|
|||
page = 'proceedings-bygroup.html'
|
||||
qs = InterimMeeting.objects.all()
|
||||
meetings = sorted(qs, key=lambda a: a.group().acronym)
|
||||
response = render(request, 'proceedings/interim_directory.html',{'meetings': meetings})
|
||||
response = render(HttpRequest(), 'proceedings/interim_directory.html',{'meetings': meetings})
|
||||
path = os.path.join(settings.SECR_INTERIM_LISTING_DIR, page)
|
||||
f = open(path,'w')
|
||||
f.write(response.content)
|
||||
|
|
@ -269,7 +270,7 @@ def create_proceedings(meeting, group, is_final=False):
|
|||
settings.MEDIA_URL,
|
||||
meeting.date.strftime('%Y/%m/%d'),
|
||||
group.acronym)
|
||||
|
||||
|
||||
# Only do these tasks if we are running official proceedings generation,
|
||||
# otherwise skip them for expediency. This procedure is called any time meeting
|
||||
# materials are uploaded/deleted, and we don't want to do all this work each time.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ from ietf.secr.proceedings.proc_utils import ( gen_acknowledgement, gen_agenda,
|
|||
from ietf.utils.log import log
|
||||
|
||||
# -------------------------------------------------
|
||||
# Globals
|
||||
# Globals
|
||||
# -------------------------------------------------
|
||||
AUTHORIZED_ROLES=('WG Chair','WG Secretary','RG Chair','AG Secretary','IRTF Chair','IAB Group Chair','Area Director','Secretariat','Team Chair')
|
||||
# -------------------------------------------------
|
||||
|
|
@ -228,7 +228,7 @@ def post_process(doc):
|
|||
base,ext = os.path.splitext(doc.external_url)
|
||||
doc.external_url = base + '.pdf'
|
||||
doc.save()
|
||||
|
||||
|
||||
# -------------------------------------------------
|
||||
# AJAX Functions
|
||||
# -------------------------------------------------
|
||||
|
|
@ -290,12 +290,12 @@ def ajax_get_sessions(request, meeting_num, acronym):
|
|||
group = Group.objects.get(acronym=acronym)
|
||||
except ObjectDoesNotExist:
|
||||
return results
|
||||
|
||||
|
||||
sessions = Session.objects.filter(meeting=meeting,group=group,status='sched')
|
||||
|
||||
|
||||
# order by time scheduled
|
||||
sessions = sorted(sessions,key = lambda x: x.official_timeslotassignment().timeslot.time)
|
||||
|
||||
|
||||
for n,session in enumerate(sessions,start=1):
|
||||
timeslot = session.official_timeslotassignment().timeslot
|
||||
val = '{}: {} {}'.format(n,timeslot.time.strftime('%m-%d %H:%M'),timeslot.location.name)
|
||||
|
|
@ -303,7 +303,7 @@ def ajax_get_sessions(request, meeting_num, acronym):
|
|||
results.append(d)
|
||||
|
||||
return results
|
||||
|
||||
|
||||
@jsonapi
|
||||
def ajax_order_slide(request):
|
||||
'''
|
||||
|
|
@ -485,7 +485,7 @@ def interim(request, acronym):
|
|||
type_id='session',
|
||||
)
|
||||
|
||||
create_interim_directory(request)
|
||||
create_interim_directory()
|
||||
make_directories(meeting)
|
||||
|
||||
messages.success(request, 'Meeting created')
|
||||
|
|
@ -630,29 +630,29 @@ def recording(request, meeting_num):
|
|||
'''
|
||||
meeting = get_object_or_404(Meeting, number=meeting_num)
|
||||
sessions = meeting.session_set.filter(type='session',status='sched').order_by('group__acronym')
|
||||
|
||||
|
||||
if request.method == 'POST':
|
||||
form = RecordingForm(request.POST)
|
||||
if form.is_valid():
|
||||
group = form.cleaned_data['group']
|
||||
external_url = form.cleaned_data['external_url']
|
||||
session = form.cleaned_data['session']
|
||||
|
||||
|
||||
if Document.objects.filter(type='recording',external_url=external_url):
|
||||
messages.error(request, "Recording already exists")
|
||||
return redirect('proceedings_recording', meeting_num=meeting_num)
|
||||
else:
|
||||
create_recording(session,meeting,group,external_url)
|
||||
|
||||
|
||||
# rebuild proceedings
|
||||
create_proceedings(meeting,group)
|
||||
|
||||
|
||||
messages.success(request,'Recording added')
|
||||
return redirect('proceedings_recording', meeting_num=meeting_num)
|
||||
|
||||
|
||||
else:
|
||||
form = RecordingForm()
|
||||
|
||||
|
||||
return render_to_response('proceedings/recording.html',{
|
||||
'meeting':meeting,
|
||||
'form':form,
|
||||
|
|
@ -668,12 +668,12 @@ def recording_edit(request, meeting_num, name):
|
|||
'''
|
||||
recording = get_object_or_404(Document, name=name)
|
||||
meeting = get_object_or_404(Meeting, number=meeting_num)
|
||||
|
||||
|
||||
if request.method == 'POST':
|
||||
button_text = request.POST.get('submit', '')
|
||||
if button_text == 'Cancel':
|
||||
return redirect("proceedings_recording", meeting_num=meeting_num)
|
||||
|
||||
|
||||
form = RecordingEditForm(request.POST, instance=recording)
|
||||
if form.is_valid():
|
||||
# save record and rebuild proceedings
|
||||
|
|
@ -683,14 +683,14 @@ def recording_edit(request, meeting_num, name):
|
|||
return redirect('proceedings_recording', meeting_num=meeting_num)
|
||||
else:
|
||||
form = RecordingEditForm(instance=recording)
|
||||
|
||||
|
||||
return render_to_response('proceedings/recording_edit.html',{
|
||||
'meeting':meeting,
|
||||
'form':form,
|
||||
'recording':recording},
|
||||
RequestContext(request, {}),
|
||||
)
|
||||
|
||||
|
||||
@check_permissions
|
||||
def replace_slide(request, slide_id):
|
||||
'''
|
||||
|
|
@ -725,7 +725,7 @@ def replace_slide(request, slide_id):
|
|||
new_slide.external_url = disk_filename
|
||||
new_slide.save()
|
||||
post_process(new_slide)
|
||||
|
||||
|
||||
# create DocEvent uploaded
|
||||
DocEvent.objects.create(doc=slide,
|
||||
by=request.user.person,
|
||||
|
|
@ -848,7 +848,7 @@ def select_interim(request):
|
|||
redirect_url = reverse('proceedings_interim', kwargs={'acronym':request.POST['group']})
|
||||
return HttpResponseRedirect(redirect_url)
|
||||
|
||||
if has_role(request.user, "Secretariat"):
|
||||
if has_role(request.user, "Secretariat"):
|
||||
# initialize working groups form
|
||||
choices = build_choices(Group.objects.active_wgs())
|
||||
group_form = GroupSelectForm(choices=choices)
|
||||
|
|
@ -886,7 +886,7 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
|
|||
else:
|
||||
url = reverse('proceedings_select', kwargs={'meeting_num':meeting.number})
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
|
||||
meeting = get_object_or_404(Meeting, number=meeting_num)
|
||||
now = datetime.datetime.now()
|
||||
if acronym:
|
||||
|
|
@ -960,14 +960,14 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
|
|||
DocAlias.objects.get_or_create(name=doc.name, document=doc)
|
||||
|
||||
handle_upload_file(file,disk_filename,meeting,material_type.slug)
|
||||
|
||||
|
||||
# set Doc state
|
||||
if doc.type.slug=='slides':
|
||||
doc.set_state(State.objects.get(type=doc.type,slug='archived'))
|
||||
doc.set_state(State.objects.get(type='reuse_policy',slug='single'))
|
||||
else:
|
||||
doc.set_state(State.objects.get(type=doc.type,slug='active'))
|
||||
|
||||
|
||||
# create session relationship, per Henrik we should associate documents to all sessions
|
||||
# for the current meeting (until tools support different materials for diff sessions)
|
||||
for s in sessions:
|
||||
|
|
@ -985,7 +985,7 @@ def upload_unified(request, meeting_num, acronym=None, session_id=None):
|
|||
rev=doc.rev,
|
||||
desc='New revision available',
|
||||
time=now)
|
||||
|
||||
|
||||
post_process(doc)
|
||||
create_proceedings(meeting,group)
|
||||
messages.success(request,'File uploaded sucessfully')
|
||||
|
|
|
|||
Loading…
Reference in a new issue