Henrik Levkowetz
0aba8663a5
Updated known-good agenda.csv master to match blankline elimination from template.
...
- Legacy-Id: 6628
2013-11-02 22:13:51 +00:00
Henrik Levkowetz
43c1b096dd
Updated known-good files.
...
- Legacy-Id: 6617
2013-11-02 20:21:22 +00:00
Henrik Levkowetz
13b6c7a983
Updated template and support functions for iPhone agenda page.
...
- Legacy-Id: 6582
2013-10-31 17:58:59 +00:00
Robert Sparks
7a84ffe197
Reverted materials.html and the view that drives it to before the 4.70 merge.
...
Tweaked the view to get (I hope) the right things.
- Legacy-Id: 6580
2013-10-31 17:16:53 +00:00
Henrik Levkowetz
45b9b45f28
Removed a lot of dead code and unused imports.
...
- Legacy-Id: 6578
2013-10-30 21:51:13 +00:00
Henrik Levkowetz
1208ae708b
Removed 2 tests which tested dead code.
...
- Legacy-Id: 6577
2013-10-30 21:33:10 +00:00
Henrik Levkowetz
dc6d96797b
Removed unused imports. Marked some instances of code which used variables that don't exist. Removed dependency on the logging module, we use syslog by default. Replaced some log.debug() calls with debug.log().
...
- Legacy-Id: 6576
2013-10-30 21:27:40 +00:00
Henrik Levkowetz
6c8802a3cc
Needlessly fixed a naming error in meeting.proxy.
...
- Legacy-Id: 6575
2013-10-30 21:23:22 +00:00
Henrik Levkowetz
adc5b130dc
Fixed incorrect except statement syntax.
...
- Legacy-Id: 6574
2013-10-30 21:21:28 +00:00
Henrik Levkowetz
c8e7a4a5d4
Updated test masters to match the changed (and now more predictable) order
...
of some entries.
- Legacy-Id: 6538
2013-10-29 22:45:29 +00:00
Henrik Levkowetz
951670e9df
New view code and templates for agenda pages, updating all agenda templates
...
to take schedule-specific information so that they will work with arbitrary
schedules, not just the official schedule for a meeting.
- Legacy-Id: 6537
2013-10-29 22:44:13 +00:00
Henrik Levkowetz
c61d1d1c2f
Provided new methods Meeting.vtimezone() which return a vtimezone stanza for
...
ical files, based on the timezone setting for a meeting, fetched from a pre-
generated file; and Session.ical_status(), which provides a string appropriate
for use in ical STATUS: entries.
- Legacy-Id: 6536
2013-10-29 22:30:38 +00:00
Henrik Levkowetz
93826ae094
Fixed the case where the urlpattern regexp match gives us an ext which is None.
...
- Legacy-Id: 6502
2013-10-27 23:04:02 +00:00
Henrik Levkowetz
16ae35ae19
Rewrote html and text agenda templates to take schedule as data.
...
- Legacy-Id: 6495
2013-10-27 12:16:37 +00:00
Henrik Levkowetz
2dcb9bc39d
Removed the ams_filters template tag file from the meeting app -- it was a copy of the ams_filters under secr/, and masked it.
...
- Legacy-Id: 6481
2013-10-22 19:01:18 +00:00
Henrik Levkowetz
e3eeee53fb
Renumbered unapplied migration.
...
- Legacy-Id: 6475
2013-10-21 21:51:21 +00:00
Henrik Levkowetz
11230a8448
Let Timeslot.session() Return the first session, rather than none, for
...
timeslots with multiple associated sessions for the public schedule.
- Legacy-Id: 6464
2013-10-18 12:15:46 +00:00
Henrik Levkowetz
819b4c6087
Made the timeslots returned from meeting.proxy.MeetingTimeProxy.sessions()
...
distinct, to avoid duplicate agenda entries.
- Legacy-Id: 6463
2013-10-18 12:14:26 +00:00
Henrik Levkowetz
e9980b483f
Made the timeslots sent to the agenda.ics template distinct, to avoid
...
duplicate agenda items. Fixes issue #1155 .
- Legacy-Id: 6462
2013-10-18 11:59:15 +00:00
Henrik Levkowetz
ee1ae839d9
Added caching for the somewhat costly TimeSlot.session() method/property.
...
This speeds up text agenda generation using the legacy template substantially.
- Legacy-Id: 6461
2013-10-17 11:32:27 +00:00
Henrik Levkowetz
a23d31677f
Tweaked the strings displayed when a plenary agenda cannot be shown.
...
- Legacy-Id: 6460
2013-10-17 11:28:29 +00:00
Henrik Levkowetz
5807ad2108
Changed the select statement in MeetingProxy.sessions() to produce correct
...
results for the official agenda, and filter out timeslot entries without
scheduled sessions.
- Legacy-Id: 6459
2013-10-17 11:27:45 +00:00
Henrik Levkowetz
d2d532a015
Removed ADs from known-good master to match template change.
...
- Legacy-Id: 6457
2013-10-17 11:22:40 +00:00
Henrik Levkowetz
e33fe28a2c
Reverted to release 4.72 versions of several functions and methods, starting
...
with agenda_info() and the view functions that use it. Also changed
meeting/tests/agenda.py to accept matching return values. Reverted old
supporting models and proxy models to 4.72 versions, too, in meeting/proxy.py
and proceedings/models.py. Updated the proxy models which rely on TimeSlot
to work properly with the m2m sessions field, and adjusted some other
functions, such as session_agenda() to also understand the m2m sessions
field (and its reverse). Added an understanding of the "bof-conc" state
to the code which returns 'BOF' or 'WG' for agenda templates.
- Legacy-Id: 6452
2013-10-15 17:54:42 +00:00
Henrik Levkowetz
6a9e9dac55
Changed 'WG' to 'BOF' for some sessions that actually were BOF sessions
...
in the csv agenda test master.
- Legacy-Id: 6449
2013-10-15 17:34:54 +00:00
Henrik Levkowetz
6f6f1d65e6
Added known-good tests for agenda.ics and agenda.csv
...
- Legacy-Id: 6445
2013-10-14 18:34:36 +00:00
Henrik Levkowetz
b5ac288167
Removed a test with duplicated name. Invoked timeslot method as method, to align with removed @property decorator.
...
- Legacy-Id: 6443
2013-10-13 21:14:46 +00:00
Henrik Levkowetz
036f31a397
Removed the agenda=83.txt test for real this time.
...
- Legacy-Id: 6442
2013-10-13 21:13:14 +00:00
Henrik Levkowetz
6d28eb180e
Replaced the handcoded agenda-83.txt test with one using the testurl
...
framework, moving the known-good master to a name matching the others
mentioned in testurl.list.
- Legacy-Id: 6438
2013-10-13 20:41:12 +00:00
Henrik Levkowetz
e516dc7925
Reinstated the release 4.72 get_agenda_info() as legacy_get_agenda_info(),
...
and tweaked it to work with the new Timeslot model's sessions field.
Reverted the html agenda view code to use legacy_get_agenda_info(), based
on the release 4.72 code. This is a fix to display the html agenda for
now, and will need more cleanup, but this should be done without introducing
scheduledsession instances to the template.
- Legacy-Id: 6437
2013-10-13 17:59:42 +00:00
Henrik Levkowetz
9be2f712b8
Added a property method to return what the 'session' field used to return,
...
but based on the 'sessions' m2m field filtered with the meeting agenda.
This is right for the main meeting agenda, but not for personal schedule
layouts, so this isn't a final fix.
- Legacy-Id: 6436
2013-10-13 17:54:59 +00:00
Henrik Levkowetz
256e033be3
Add known-good files for agenda.html and agenda-utc.html, and update
...
testurl.list to do comparisons against those. Some tweaks are still
needed to filter out versions strings, etc.
- Legacy-Id: 6434
2013-10-13 17:47:52 +00:00
Henrik Levkowetz
bb148003b5
Fixed the plenary display code for the text agenda to use the non-proxy plenary information to identify the plenaries, matching other previous changes from the agenda branch.
...
- Legacy-Id: 6383
2013-10-08 06:42:53 +00:00
Henrik Levkowetz
dbc17624f8
Added a break_info() model on Timeslot. Fixes the missing breaks on the
...
text agenda.
- Legacy-Id: 6376
2013-10-04 21:49:52 +00:00
Henrik Levkowetz
f95b2795fe
Putting a place a known-good text version of the agenda for meeting 83. This
...
is the way it should look. If something else is produced, it's not right.
The order of sessions on this agenda is sorted first on area on then on
acronym. This is the known good agenda.
- Legacy-Id: 6375
2013-10-04 21:18:47 +00:00
Henrik Levkowetz
8561e9c2d8
Removed unwanted Http403 exception.
...
- Legacy-Id: 6374
2013-10-04 20:46:08 +00:00
Henrik Levkowetz
799c8c8f69
Fixed the agenda-utc test to be insensitive to the release number.
...
- Legacy-Id: 6373
2013-10-04 20:43:46 +00:00
Henrik Levkowetz
da1cf81bf7
Fixed the return value assigment from agenda_info() in cvs_agenda()
...
- Legacy-Id: 6372
2013-10-04 20:41:02 +00:00
Henrik Levkowetz
e2134a67a2
Rename agendaREDESIGN.ics -> agenda.ics. The old agenda.ics file isn't in use
...
any more.
- Legacy-Id: 6370
2013-10-04 18:47:20 +00:00
Henrik Levkowetz
83cab39be7
Added a RoomAdmin to the admin site.
...
- Legacy-Id: 6369
2013-10-04 18:08:09 +00:00
Henrik Levkowetz
03a79d4736
Merged [6363] from mcr@sandelman.ca: Don't include timeslots marked
...
'unavailable' in the agenda.
- Legacy-Id: 6365
Note: SVN reference [6363] has been migrated to Git commit 8de0d8a0c8814059b153e96929220bed6cb46e2c
2013-10-04 14:07:13 +00:00
Henrik Levkowetz
e87ba2d869
Added ordering ('-date') to the Meeting model
...
- Legacy-Id: 6364
2013-10-04 14:03:12 +00:00
Henrik Levkowetz
807ea25e3c
Removed some debug statements.
...
- Legacy-Id: 6350
2013-10-03 14:20:14 +00:00
Henrik Levkowetz
a3c8adfdf6
Merged in the contents of commit [6337] from mcr@sandelman.ca, with some changes to take out dead code that inadvertently came back in.
...
- Legacy-Id: 6344
Note: SVN reference [6337] has been migrated to Git commit d0d1d949a9328da6c4e30d8f5e0d14ffb204e678
2013-10-02 21:53:28 +00:00
Henrik Levkowetz
fada6fdfc9
Provide the site_base_url to the template without a trailing slash, for easier use in javascript.
...
- Legacy-Id: 6339
2013-10-02 14:11:30 +00:00
Henrik Levkowetz
983785d63c
Fixed a typo.
...
- Legacy-Id: 6326
2013-09-30 21:00:12 +00:00
Henrik Levkowetz
87898cb006
Updated the text agenda comparison copy to match the ADs present in the fixtures.
...
- Legacy-Id: 6325
2013-09-30 20:50:32 +00:00
Henrik Levkowetz
c6739bbb4f
Modified testurl.list for meetings; there were some URLs that could not succeed with the current database content (the URL tests are running against database content taken from the production database, so this is not a case of missing fixtures).
...
- Legacy-Id: 6322
2013-09-30 20:40:02 +00:00
Henrik Levkowetz
e4f4467725
Changed tests to use our own subclassed TestCase, and changed almost all fixtures to be perma_fixtures.
...
- Legacy-Id: 6320
2013-09-30 20:36:20 +00:00
Henrik Levkowetz
4395949b85
Fixed up to use perma_fixtures instead of fixtures. Changed diff of html-agenda so it disregards the changing datatracker version information embedded in the html file. Changed dumping of agenda page results to file to not use a code constant, but instead happen if the test fails. Added an announcement of this to the test exception string.
...
- Legacy-Id: 6319
2013-09-30 20:29:11 +00:00