altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity
4002 commits 1 branch 0 tags 2.6 GiB
Commit graph

185 commits

Author SHA1 Message Date
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
Henrik Levkowetz 083f60dd93 Renamed model .url() methods to .json_url() or .base_url(), depending on function. Replaced the use of custom django method request.get_host_protocol() with standard request.build_absolute_uri(). Removed an uncaught Http403 exception. Fixed a typo /venus_addr/venue_addr/. Removed relurl() methods; no longer needed. Removed some debug functions. 
- Legacy-Id: 6309
 2013-09-29 21:14:07 +00:00
Henrik Levkowetz 127deda3c7 The supposedly known-good agenda-utc.html file was filled with '****** SOMETHING WENT WRONG ******', which is clearly wrong. This one is a bit better. 
- Legacy-Id: 6308
 2013-09-29 20:57:46 +00:00
Henrik Levkowetz 92b9da1d4f Moved read_agenda_file() and session_draft_list() back to views.py. The move almost masked a code change in trunk during the merge. 
- Legacy-Id: 6294
 2013-09-28 05:42:49 +00:00
Henrik Levkowetz 26688aa2ec Changed back to standard TestCase to ensure confidence in tests. Removed duplicate tests. Adapted tests to new json_url() method signature. Corrected the /people/ urls to /person/. 
- Legacy-Id: 6293
 2013-09-28 05:35:17 +00:00
Henrik Levkowetz 72a19e2ab2 Fixed the on-and-off failing test_agenda83txt(), which gave inconsistent results because the datetime object given to the template to render had no timezone setting. Added a PRODUCTION_TIMEZONE setting, and used it to provide a consistent timezone to the agenda.txt template. 
- Legacy-Id: 6292
 2013-09-27 20:07:42 +00:00
Henrik Levkowetz 7876340a44 Undid gratuitous whitespace changes. 
- Legacy-Id: 6283
 2013-09-26 21:27:21 +00:00
Henrik Levkowetz ea9d075801 Undid gratuitous whitespace changes. 
- Legacy-Id: 6282
 2013-09-26 21:26:56 +00:00
Henrik Levkowetz 2f1edc3d68 Undid gratuitous whitespace changes. 
- Legacy-Id: 6281
 2013-09-26 21:20:41 +00:00
Henrik Levkowetz 321744b0b9 Undid gratuitous whitespace and quoting changes. This code is taken verbatim from an external source, as indicated at the beginning of the file, and should not be messed with unless we fix bugs. 
- Legacy-Id: 6280
 2013-09-26 21:10:41 +00:00
Henrik Levkowetz 6154b9922d This commit isn't tested. It captures the state after merging in branch/ssw/agenda/v4.70. 
- Legacy-Id: 6273
 2013-09-26 19:56:17 +00:00
Henrik Levkowetz db7106a70c Fixed legacy document fieldname. 
- Legacy-Id: 6126
 2013-09-09 20:54:56 +00:00
Ole Laursen 023d02feb8 Apparently the session_draft_list fix was missing a .distinct(), 
rewrite slightly to add that
 - Legacy-Id: 6062
 2013-08-15 09:51:13 +00:00