Commit graph

3963 commits

Author SHA1 Message Date
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 ff403d07ef Reverted to release 4.72 versions of txt, ics, and csv agendas, with minor tweaks.
- Legacy-Id: 6451
2013-10-15 17:45:55 +00:00
Henrik Levkowetz 65d505edf3 Fixed some bugs in the method which saves a copy of a page which failed a
testurl diff test.
 - Legacy-Id: 6450
2013-10-15 17:37:30 +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 dfe81e6882 Add setting for where to save files which fail urltest diffs.
- Legacy-Id: 6448
2013-10-14 18:39:33 +00:00
Henrik Levkowetz b951a187a7 If we have a diff with a known-good master in a testurl.list file, save the
failed file for inspection.
 - Legacy-Id: 6447
2013-10-14 18:38:13 +00:00
Henrik Levkowetz bc0e4e5614 Tweaked the makefixture command to not recurse on reverse relationships.
- Legacy-Id: 6446
2013-10-14 18:36:20 +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 e5c5d4cafa Tweaked the return handling for urltest diffs.
- Legacy-Id: 6444
2013-10-13 23:43:50 +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 ec05016585 Added a test assertion in the case of a failed urltest diff, to have the
test noticed as failed.
 - Legacy-Id: 6441
2013-10-13 21:12:23 +00:00
Henrik Levkowetz 7d4b1656bb Changed a test which changed a WG acronym, since this will (and should)
fail now -- we don't want to permit acronym changes.
 - Legacy-Id: 6440
2013-10-13 21:11:10 +00:00
Henrik Levkowetz a7838d8765 Cleanup action: replaced screaming html id with non-screaming version;
replaced the noTable block construct with start/end table_content blocks
in order to not have to open and close tables in different blocks, and
not have empty tables lying about.
 - Legacy-Id: 6439
2013-10-13 21:09:32 +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 d3983b668a Reverted html agenda templates to release 4.72 state, except for a jquery
version change and moving inline weekview javascript to a separate file.
 - Legacy-Id: 6435
2013-10-13 17:52:09 +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 90e95e6f15 Repurpose the 'master' column in testurl.list files to point to a local
known-good master file, for comparisons.
 - Legacy-Id: 6433
2013-10-13 17:46:19 +00:00
Henrik Levkowetz 390309412f Changed the WG edit form so that once an acronym has been set, the acronym
field is read-only; also changed the form validation to not permit changes
to an existing acronym.
 - Legacy-Id: 6432
2013-10-12 15:33:54 +00:00
Henrik Levkowetz 422e5a438e Changed NOMCOM_FROM_EMAIL to be the Nomcom chair instead of the secretariat. Fixes issue #1152.
- Legacy-Id: 6431
2013-10-11 20:20:48 +00:00
Henrik Levkowetz 697dcc450a If an exception is raised earlier in field validation, the
position field may not be set when we get to this point and
try to retrieve the value of a different field than the one
we're processing. Don't cause a new exception in that case.
 - Legacy-Id: 6416
2013-10-11 12:31:50 +00:00
Henrik Levkowetz 3e668a1bca Merged [6413] from rjsparks@nostrum.com:
Removed redundant call to not_duplicated from the nomcom/private_index template

It was already applied in the view, and interacted badly with the 
list comprehension method of filtering for NomineePositions that 
had associated questionnaire responses.

Fixes bug 1151.
 - Legacy-Id: 6415
Note: SVN reference [6413] has been migrated to Git commit 3814b60c5d
2013-10-11 02:17:43 +00:00
Henrik Levkowetz e24f97550c Added Ryan to the admin list so he'll get 500 notifications.
- Legacy-Id: 6414
2013-10-11 02:11:33 +00:00
Henrik Levkowetz 5b003d3842 Missing import in nomcom file.
- Legacy-Id: 6393
2013-10-09 08:37:09 +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 70bfcfe6f4 Fixed a wrong email address in bin/commitlog
- Legacy-Id: 6368
2013-10-04 18:06:44 +00:00
Henrik Levkowetz 0444c2573e Fixed some deficiencies in the changelog.
- Legacy-Id: 6367
2013-10-04 18:05:40 +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 3020c5f7eb Imported a new version of the draft metadata extraction module, which
calculates page numbers more reliably, doesn't include duplicates in
the list of referenced drafts, and other minor tweaks.
 - Legacy-Id: 6362
2013-10-04 13:50:14 +00:00
Henrik Levkowetz 6c13e8027b Fixed the language in some UI strings in the nomcom tool.
- Legacy-Id: 6358
2013-10-03 20:56:59 +00:00
Henrik Levkowetz ed891d23d0 Set version info and settings back to development mode
- Legacy-Id: 6355
2013-10-03 14:22:46 +00:00
Henrik Levkowetz d256693205 Set version info to release version 4.80 before branching.
- Legacy-Id: 6353
2013-10-03 14:22:42 +00:00
Henrik Levkowetz 2d95c9cc11 Changelog entry for 4.80
- Legacy-Id: 6352
2013-10-03 14:22:40 +00:00
Henrik Levkowetz 212ff26fad Reverted a mistake in agenda.html.
- Legacy-Id: 6351
2013-10-03 14:22:29 +00:00
Henrik Levkowetz 807ea25e3c Removed some debug statements.
- Legacy-Id: 6350
2013-10-03 14:20:14 +00:00
Henrik Levkowetz c78be852a5 Added a new WG (ietf stream) tag slug.
- Legacy-Id: 6349
2013-10-03 11:48:56 +00:00
Henrik Levkowetz cc8817846a Applied the same patch to other templates which use the same approach. Fixed 2 typos.
- Legacy-Id: 6347
2013-10-03 05:40:41 +00:00
Henrik Levkowetz ca81ed0840 Moved script loading inside {% block scripts %}. Patch from rjsparks@nostrum.com.
- Legacy-Id: 6346
2013-10-03 05:11:43 +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 08e90fd63f Enabling jquery again in template base.html. Moving library pack jquery-1.8.2 from /static/js/ to /static/js/lib/. Replacing jquery-1.5.1 with 1.8.2 in some places; the incompatibilities listed on the jquery pages seem to be small, and on a cursory inspection not present in the current usage.
- Legacy-Id: 6342
2013-10-02 15:44:50 +00:00