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

421 commits

Author SHA1 Message Date
Robert Sparks cb659afd2f changed call to skip to make the code more readable 
- Legacy-Id: 8134
 2014-07-19 20:36:55 +00:00
Henrik Levkowetz 4f0d483f91 Added django-admin support for meeting.ScheduledSession 
- Legacy-Id: 8002
 2014-06-30 19:12:34 +00:00
Henrik Levkowetz db7adf1fb5 Modified the code which adds non-session entries to a schedule so as to bind a Session object also to Break and Registration timeslots, through the Schedule/Timeslot/Session m2m table. This makes the agenda templates work as expected. There's also a migration and a standalone script that fills in this information for existing schedules. 
- Legacy-Id: 7975
 2014-06-30 17:05:40 +00:00
Henrik Levkowetz 6e3bb37ecb Merged in [7935] from liudapeng@chinamobile.com: 
Add brief_display function in Constraint class to display both WG conflict and person conflict. Fixes issue #1384.
 - Legacy-Id: 7938
Note: SVN reference [7935] has been migrated to Git commit 425f88cad70f7a473c6f5bf58bbde581a85ccb39
 2014-06-26 19:56:34 +00:00
Robert Sparks bdc9b7aa07 initial automated test, establishes framework 
- Legacy-Id: 7933
 2014-06-25 20:27:26 +00:00
Henrik Levkowetz b3c06d1e8c Patch from mcr@sandelman.ca: Correct the post data of a meeting test case. 
- Legacy-Id: 7826
 2014-06-02 21:40:42 +00:00
Henrik Levkowetz f86c59209f Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too. 
- Legacy-Id: 7641
 2014-04-25 13:14:53 +00:00
Henrik Levkowetz bf1e44864d Merged in [7561] from rjsparks@nostrum.com: 
Updates and bugfixes to the agenda editing features
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command
 - Legacy-Id: 7628
Note: SVN reference [7561] has been migrated to Git commit 1221f79af9
 2014-04-22 21:34:23 +00:00
Henrik Levkowetz 2c27eb481d Merged in [7519] from olau@iola.dk: 
Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site
 - Legacy-Id: 7602
Note: SVN reference [7519] has been migrated to Git commit 9ddecc1970
 2014-04-12 18:50:01 +00:00
Henrik Levkowetz b02b0a96df All tests pass, except for some pyflakes tests which I believe are fixed in trunk. 
- Legacy-Id: 7579
 2014-04-06 20:04:36 +00:00
Robert Sparks 1221f79af9 Updates and bugfixes to the agenda editing features 
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command

Commit ready for merge.
 - Legacy-Id: 7561
 2014-04-01 22:17:18 +00:00
Ryan Cross 0fafe56381 allow edit of timeslots, changes to scheduled notifications, support non-official schedules 
- Legacy-Id: 7554
 2014-03-28 23:16:41 +00:00
Henrik Levkowetz ff0dbe0d52 Merged in source:personal/henrik/r7446-pyflakes@7463, which adds pyflakes tests to the test suite, and makes the code pyflakes-clean. 
- Legacy-Id: 7521
 2014-03-19 18:48:33 +00:00
Ole Laursen 9ddecc1970 Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site 
- Legacy-Id: 7519
 2014-03-19 17:40:21 +00:00
Robert Sparks be81557611 Shifted building the edit time slices from looking at scheduledsessions to looking at timeslots 
- Legacy-Id: 7511
 2014-03-17 21:49:01 +00:00
Robert Sparks 0d5a940f55 Create no ScheduledSessions with session=None 
- Legacy-Id: 7510
 2014-03-17 18:54:11 +00:00
Henrik Levkowetz 02031a01b9 Cleaned out some (arbitrary) submodule name imports into ietf.utils, and made the corresponding import statements import the names directly from the correct submodules. 
- Legacy-Id: 7495
 2014-03-16 07:09:38 +00:00
Henrik Levkowetz c296cb479f Made ietf/meeting pyflakes-clean. Removed some debug-related dead code. 
- Legacy-Id: 7473
 2014-03-15 18:57:07 +00:00
Henrik Levkowetz 5bef5d11ae Made doc/ pyflakes-clean. 
- Legacy-Id: 7462
 2014-03-15 16:09:47 +00:00
Robert Sparks 08ae032169 added a roomresource to the meeting test data 
- Legacy-Id: 7460
 2014-03-14 20:24:03 +00:00
Robert Sparks 62600beefa improved test of scheduledsessions_json, added tests for extending a session 
- Legacy-Id: 7459
 2014-03-14 03:39:42 +00:00
Robert Sparks 1ef73b5a76 Reworked the worst of the conflicting permissions policies 
- Legacy-Id: 7458
 2014-03-13 20:45:06 +00:00
Robert Sparks f4a72ffe2a cleaned up permissions on dajaxice calls, ported and expanded more tests, refactored sendEmail, made a secr filter more robust 
- Legacy-Id: 7457
 2014-03-13 18:47:31 +00:00
Robert Sparks 1a3c2ce431 Patched meeting/ajax to close permissions vulnerability. Tweaked tests to check the right functionality given the permissions policy currently in trunk 
- Legacy-Id: 7456
 2014-03-13 17:39:34 +00:00
Robert Sparks f292af9949 minor comments and one addition to test_save_agenda... 
- Legacy-Id: 7453
 2014-03-12 17:34:27 +00:00
Robert Sparks ad2784962f ported forward from personal/rjs/trunk-7174. Still one existing test failing 
- Legacy-Id: 7449
 2014-03-08 10:37:24 +00:00
Henrik Levkowetz 722a008d25 Fixed overflow error for meetings without timeslots, which gave server errors for meeting/64/agenda.html. 
- Legacy-Id: 7276
 2014-02-20 11:26:52 +00:00
Robert Sparks b1e0ba3d1b Adds the IAB-parented sessions to the set of things returned as "areas" 
Fixes bug #1288
Commit ready for merge
 - Legacy-Id: 7204
 2014-02-04 15:59:34 +00:00
Henrik Levkowetz 6e97c2c8da Merged in the port from Django 1.2 to Django 1.6 from olau@iola.dk: branch/iola/djangoport@7121, and fixed some merge issues. 
- Legacy-Id: 7152
 2014-01-18 21:02:40 +00:00
Ole Laursen 7dcaed414d Add a simple test of the dajaxice.core.js hack for the time being 
- Legacy-Id: 7084
 2014-01-08 18:13:10 +00:00
Ole Laursen c7a2c64c10 Get rid of fixtures that were added for the meeting tests previously, they are not used anymore, and incomplete so will not load with Django 1.6 
- Legacy-Id: 7070
 2013-12-24 16:14:05 +00:00
Ole Laursen d5b14f3fb3 Rewrite meeting tests: add fake data generator, rewrite the 
SimpleUrlTest tests to work with fake data and expand them a bit (they
are still pretty basic), rewrite the agenda editing tests to work with
the small generated fake data, delete those tests that are trivial or
only testing fixture facts as opposed to actually exercising the code,
combine some of them, expand most to actually check the returned JSON
and generally clean up the copy-paste mess of incorrect comments and
incorrect POST data.

At this point, no tests are using the real data base test machinery,
so one can run the full test suite with just

  python manage.py test --settings=settings_sqlitetest

This takes about 72 seconds one a 2.4 GHz Intel Core 2. The
test-crawler and other real data tests take somewhat longer, though.
 - Legacy-Id: 7069
 2013-12-24 16:09:33 +00:00
Ole Laursen 3408b73872 Use request.POST directly instead of aliasing it to update_dict, add a 
FIXME on permission naming
 - Legacy-Id: 7068
 2013-12-24 15:59:01 +00:00
Ole Laursen f8b1568c87 Rewrite meeting PUTs to POSTs. For no apparent reason, parts of the 
meeting AJAX code is using PUT instead of POST (even if it's not
PUT'ing in the literal sense but POST'ing). Theoretical discussions
aside, Django has poor support for PUTs turned POSTs so rewriting them
removes the need for a couple of hacks, and makes it easier to test.
 - Legacy-Id: 7067
 2013-12-24 15:13:33 +00:00
Ole Laursen c098fb4f07 Regularize meeting_json to take num instead of meeting_num like the 
other meeting AJAX views
 - Legacy-Id: 7060
 2013-12-23 17:19:49 +00:00
Ole Laursen 77bd8772b5 Fix interesting syntax error in group_session_mapping, += was mistyped 
as =+ which is legal (assignment followed by unary +)
 - Legacy-Id: 7059
 2013-12-23 16:59:21 +00:00
Ole Laursen b4fa414406 Make agenda_permission use user_is_person, rewrite it to be a little 
less verbose
 - Legacy-Id: 7054
 2013-12-23 16:43:44 +00:00
Ole Laursen e69ba1e8c4 Fix spelling mistakes in comments for Constraint 
- Legacy-Id: 7053
 2013-12-23 16:08:36 +00:00
Ole Laursen b42a1165d7 Use .first() and prevent an extra .count() query in TimeSlot.session 
- Legacy-Id: 7052
 2013-12-23 15:40:10 +00:00
Ole Laursen 7dc534f325 Add a couple of select_related fields to edit_timeslots to reduce 
number of DB queries from 400 to 13
 - Legacy-Id: 7051
 2013-12-23 13:25:22 +00:00
Ole Laursen d6d80a4a77 Make a couple of the utility methods in meeting.models use .first(), 
fix potential bug in slot_to_the_right, test on location_id instead of
location in build_timeslices to speed up the edit timeslots view
 - Legacy-Id: 7050
 2013-12-23 13:24:40 +00:00
Ole Laursen fa489ce37a Upgrade Dajaxice to latest version from github (0.5.5) to make meeting agenda code work with CSRF, with url conf import fix and using json instead of deprecated simplejson from Django - add a simple view to serve dajaxice.core.js which we need because we are not using the staticfiles collection step (apparently Dajaxice hooks into that through a somewhat complicated hack) 
- Legacy-Id: 7028
 2013-12-20 11:59:09 +00:00
Ole Laursen 88860edba4 Use user_is_person to determine whether user is schedule owner in 
agenda AJAX, instead of complicated try except
 - Legacy-Id: 7027
 2013-12-20 11:55:25 +00:00
Ole Laursen 38c153c03d Remove usage of distinct(field) in meeting/helpers.py, Django 
complains that it doesn't work on MySQL and the two uses appear
superfluous anyway since they only return the field being distincted
 - Legacy-Id: 7018
 2013-12-19 16:06:37 +00:00
Henrik Levkowetz d416ae7977 Merged in a fix from Ole. A different fix for the same problem was already present, but by picking Ole's fix here we avoid hassle in the next (Django-upgrade) merge. 
- Legacy-Id: 6993
 2013-12-18 18:39:49 +00:00
Ole Laursen f88fb5f9ac Port meeting fix from shimfree branch 
- Legacy-Id: 6984
 2013-12-18 14:56:37 +00:00
Ole Laursen 0945255452 Fix bug in meeting.helper.get_meeting - somehow managed to skip the 
clause that makes sure that meetings that have no agenda yet are
skipped
 - Legacy-Id: 6983
 2013-12-18 14:51:03 +00:00
Ole Laursen e348600bcb raw_post_data -> body 
- Legacy-Id: 6976
 2013-12-18 11:52:21 +00:00
Ole Laursen 7f277a8fbb Replace user.get_profile() with user.person, the profile stuff is deprecated since Django 1.5 
- Legacy-Id: 6968
 2013-12-18 10:13:40 +00:00
Henrik Levkowetz ecb5cd6526 Merged in branch/iola/shimfree@6856. This pretty much completes the shim removal. Next step is upgrading Django to 1.6, and then doing some final polishing. 
- Legacy-Id: 6966
 2013-12-17 21:29:05 +00:00
Ole Laursen 42ade6273c Turn on CSRF protection - all forms must from now on have a {% csrf_token %} 
- Legacy-Id: 6963
 2013-12-17 12:50:24 +00:00
Ole Laursen d66ac15fc2 Rewrite a bunch of HttpResponseRedirect + url reverse calls to instead 
take advantage of the redirect shortcut (introduced in Django 1.1)
 - Legacy-Id: 6960
 2013-12-17 10:23:42 +00:00
Henrik Levkowetz 8b2730a499 Updated agenda test files. Looking forward to moving this to fixtures instead of live data. 
- Legacy-Id: 6949
 2013-12-16 22:08:00 +00:00
Ole Laursen 84a9f49053 mimetype -> content_type (mimetype is deprecated) 
- Legacy-Id: 6945
 2013-12-16 16:53:47 +00:00
Ole Laursen 5021ed5629 Port feed setup to new feed API where each feed is a class-based view 
- Legacy-Id: 6939
 2013-12-16 16:29:22 +00:00
Ole Laursen 6a98fec2c3 Use built-in json module in Python instead of simplejson bundled with Django 
- Legacy-Id: 6883
 2013-12-11 16:59:19 +00:00
Ole Laursen c15063f3c2 Adjust the import path for feeds 
- Legacy-Id: 6879
 2013-12-11 16:40:49 +00:00
Ole Laursen cfa0d47ca0 Port to new class-based generic redirect and simple template views, remove utils.lazy.reverse_lazy, it's now included in Django 
- Legacy-Id: 6878
 2013-12-11 16:36:09 +00:00
Ole Laursen 371c4bb344 Fix computing meeting updated timestamp when there's either a timeslot 
or a session but not both
 - Legacy-Id: 6855
 2013-12-09 10:52:31 +00:00
Ole Laursen 1c60f55fff Fix some includes in meeting test 
- Legacy-Id: 6842
 2013-12-07 19:28:56 +00:00
Ole Laursen 1606890567 Trim some unused imports in the meeting tests 
- Legacy-Id: 6840
 2013-12-07 16:15:36 +00:00
Ole Laursen 48f14b8eda Remove now unused proceedings/ and meeting/proxy.py 
- Legacy-Id: 6819
 2013-12-06 17:40:41 +00:00
Ole Laursen 5ef84cd7df Move proceedings feed to meeting/ and remove traces of shim layer from it 
- Legacy-Id: 6818
 2013-12-06 16:31:02 +00:00
Ole Laursen ad9503f1ed Removing remaining traces of shim layer usage in meeting 
- Legacy-Id: 6817
 2013-12-06 16:10:10 +00:00
Ole Laursen e63ac36b8f Remove shim layer from ietfauth, delete some dead code and migrate 
remaining importers of ietfauth.decorators to ietfauth.utils
 - Legacy-Id: 6797
 2013-12-05 16:24:03 +00:00
Henrik Levkowetz 0ca9a5c245 Require that a meeting has a schedule for it to be seen as the current meeting. 
- Legacy-Id: 6785
 2013-12-03 21:35:57 +00:00
Henrik Levkowetz 30aa2b2d36 Don't crash if trying to get an update date for a meeting with missing timeslots or sessions. 
- Legacy-Id: 6784
 2013-12-03 21:35:02 +00:00
Ole Laursen 2cf72aa9e5 Remove references to names.xml in perma_fixtures, they are not needed anyway 
- Legacy-Id: 6766
 2013-11-27 13:19:58 +00:00
Ole Laursen 9457669310 Merge in changes from the old shimfree branch 
- Legacy-Id: 6764
 2013-11-27 12:55:50 +00:00
Henrik Levkowetz 7d7d08410c Speeded up the materials page by using select_related() on the session QuerySet. 
- Legacy-Id: 6729
 2013-11-21 21:05:56 +00:00
Henrik Levkowetz 239b526d57 Fixed a bug in the materials urls in agenda.ics. 
- Legacy-Id: 6666
 2013-11-06 17:03:30 +00:00
Henrik Levkowetz 58685d93e1 Updated known-good test file to match commit [6655]. 
- Legacy-Id: 6661
Note: SVN reference [6655] has been migrated to Git commit 89904c9bb3
 2013-11-06 16:00:25 +00:00
Henrik Levkowetz 6d8b178074 Include IAOC update sessions in the training section. 
- Legacy-Id: 6647
 2013-11-04 15:12:21 +00:00
Henrik Levkowetz 7925223ef8 Merged [6622] from rjsparks@nostrum.com: 
Refines Bill Fenner's regex based search through documents for references.
Populates RelatedDocument with relations for references for each type draft Document.
Replaces these reference relationships with updated copies on draft submission.

Note to deployer: There is a script to run in patches/fill_in_references.py that does the work of bringing the database up to date. It takes around 10 minutes to complete on a fast development laptop.

fixes bug #1173
 - Legacy-Id: 6633
Note: SVN reference [6622] has been migrated to Git commit a677a70df3
 2013-11-02 23:04:28 +00:00
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
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
Ole Laursen c8f173f06e Rewrite reading the draft list from a group agenda to be less weird, 
fixing problem when agenda file is not found, which turns up when
running the test-crawler on a test instance
 - Legacy-Id: 6060
 2013-08-15 08:44:29 +00:00
Ole Laursen c182d4e5e9 Return empty string instead of None in case an agenda file isn't read 
correctly, fixes annoying problem with the test crawler
 - Legacy-Id: 6055
 2013-08-14 15:48:17 +00:00
Henrik Levkowetz bd0c07290a Merged in branch/iola/milestones, which provides datatracker support for management of WG milestones. 
- Legacy-Id: 5739
 2013-05-15 22:07:23 +00:00
Henrik Levkowetz ee420423a0 Added a section to the meeting materials page for IAB sessions. Added a link bar at the top to make it easier to find sections like Training and IAB. 
- Legacy-Id: 5636
 2013-04-11 09:21:12 +00:00
Henrik Levkowetz f85881dc61 Make agenda views with timezone information work also for earlier meetings without timezone data set. 
- Legacy-Id: 5568
 2013-03-14 14:56:28 +00:00
Henrik Levkowetz 9ac6cdc581 Fixed refactoring bug. 
- Legacy-Id: 5485
 2013-03-05 23:21:51 +00:00
Henrik Levkowetz fc369a6e30 Provide html agendas with local and UTC timezone indications. 
- Legacy-Id: 5484
 2013-03-05 22:46:16 +00:00
Henrik Levkowetz 274812c5b9 Modified the set of permissible parents for session groups, in order to permit an IAB-sponsored BoF to appear on the agenda. 
- Legacy-Id: 5451
 2013-02-24 20:11:29 +00:00
Ole Laursen b19f6d8060 Merge in milestones branch 
- Legacy-Id: 5091
 2012-12-03 14:36:30 +00:00
Henrik Levkowetz cfcce2f03e Merged [5000] from rjsparks@nostrum.com: 
Made it more obvious when an intended status or shepherding AD is not set
Removed an unused template
Show reset approval text immediately.

Fixes bug #900
 - Legacy-Id: 5015
Note: SVN reference [5000] has been migrated to Git commit 2470ad77dd
 2012-11-07 13:01:34 +00:00
Henrik Levkowetz 3a7480520f Merged [4999] from jmh@joelhalpern.com: 
Correct test of final shepherd update flag.
 - Legacy-Id: 5014
Note: SVN reference [4999] has been migrated to Git commit aba18e8f38364ad17d451d0ed7e33aa01dfbeb52
 2012-11-07 12:50:38 +00:00
Adam Roach ca1ff2fa0c Implementation of ticket 893 
- Legacy-Id: 5003
 2012-11-03 21:01:40 +00:00
Adam Roach 15ff245c0a Fixed "%2C" bug introducted (exposed?) by Apple's iCloud handling of URLs 
- Legacy-Id: 4992
 2012-11-03 14:57:55 +00:00
Henrik Levkowetz 9d042badf2 Merged [4904] from adam@nostrum.com: 
Fixing conflict list; adding AD column.
 - Legacy-Id: 4961
Note: SVN reference [4904] has been migrated to Git commit 3cb42b7b0c
 2012-10-30 12:06:53 +00:00
Henrik Levkowetz 5a60a3c3d4 Improved the handling of iCalendar timezone information -- instead of simplified VTIMEZONE information generated from a template, the VTIMEZONE information for a meeting's timezone is read from file (where it presumably has been generated from the Olson timezone database, for instance using vzic. 
- Legacy-Id: 4956
 2012-10-25 21:28:08 +00:00
Henrik Levkowetz 09f89a0852 Added an 'agenda_note' field to meeting.models.Meeting, and added display of content (if any) in html and txt agendas. Added a migration, but the production system has already been patched and migrated. 
- Legacy-Id: 4947
 2012-10-22 21:05:19 +00:00
Adam Roach 3cb42b7b0c Fixing conflict list; adding AD column. 
- Legacy-Id: 4904
 2012-10-09 20:59:58 +00:00
Henrik Levkowetz 25f3f94c21 Applied fix from adam@nostrum.com: Display meeting materials with correct ordering. 
- Legacy-Id: 4754
 2012-08-10 11:58:55 +00:00
Henrik Levkowetz 9ff6d889aa Rewrote the view and template code for the meeting materials list, which was showing nothing. Better to do the rewrite for the new models than trying to dig into why the proxy models doesn't work any more. 
- Legacy-Id: 4622
 2012-07-20 11:33:15 +00:00
Henrik Levkowetz cddec8fc48 Merged in [4604] from adam@nostrum.com, which fixes problems with the html agenda code related to the schema transition. 
- Legacy-Id: 4611
Note: SVN reference [4604] has been migrated to Git commit 3e5e16371f2c0319d1c0bb738860a1f793038365
 2012-07-10 09:55:34 +00:00
Ole Laursen 419f387bce Make find_history_active_at return the original object if it is 
currently active, otherwise we can't see from the return value whether
a given time predates the history set. The downside is that the caller
may now need to check whether it got a history object or the same
object back.
 - Legacy-Id: 4560
 2012-07-02 18:09:42 +00:00
Henrik Levkowetz 1603cdab11 Since all the tables have been created earlier, the contents forward and backward of meeting/migrations/0001_initial.py is meaningless, but we need 'pass' instead for it to run. Fixed. 
- Legacy-Id: 4504
 2012-06-22 20:58:05 +00:00
Henrik Levkowetz bfaf48b60f Merged in personal/adam/v4.00 from adam@nostrum.com with fixes [4436], [4438] to the /meeting/*/requests page. 
- Legacy-Id: 4485
Note: SVN reference [4436] has been migrated to Git commit 9cfdb5afd7f77b161c43b9551ec3fc23575aa255

Note: SVN reference [4438] has been migrated to Git commit 961c6b83d293f465df678a943a7621b731a0acbb
 2012-06-21 00:00:03 +00:00
Henrik Levkowetz 546d793e5b Try to not use explicit .html extensions in the urls. Redirect from those to .html-less urls. 
- Legacy-Id: 4484
 2012-06-20 23:57:27 +00:00
Henrik Levkowetz 786c56a3ac Added a new field 'short' to Session, to help produce file names for agendas, minutes and slides for groups with different named session, such as for instance 'edu'. Generating distinct filenames directly from the name field gives too long names. 
- Legacy-Id: 4481
 2012-06-20 21:12:26 +00:00
Henrik Levkowetz 37172f3c0b Don't include interim meetings in those considered for the default meeting number for the '/meeting/' url. 
- Legacy-Id: 4407
 2012-05-07 20:39:51 +00:00
Henrik Levkowetz 8972ef7917 Fix from Adam with a tweak from Henrik for empty .ics files 
- Legacy-Id: 4337
 2012-04-26 21:38:27 +00:00
Henrik Levkowetz d383fac853 Merged branch/iola/migration-fixes@4319, containing these changesets from olau@iola.dk: 
- [4319]: Only query for regular IETF meetings when calculating cut off dates
     (reported by Ryan Cross).

   - [4311]: Fix bug in liaison form that prevents Secretariat users from posting
     statements on behalf of SDO liaison managers in some cases.


   - [4310]: Fix problem with direct replyto path in liaison form not using role
     emails (reported by Stephanie McCammon).


   - [4307]: Fix missing return in liaison proxy, fixes problem with from email
     on https://datatracker.ietf.org/liaison/1154/ as reported by Stephanie
     McCammon.


   - [4260]: Move note about IANA scraping messages, apparently I managed to
     put it in the wrong place (they're of course scraping draft approvals, not
     the ballot announcements).


   - [4253]: Move last call announcement text to last call event rather than
     stuffing it inside the state change event.


   - [4252]: Declare coding system to work around annoying problem when the
     date produced by SVN is localized.
 - Legacy-Id: 4331
Note: SVN reference [4252] has been migrated to Git commit 5858454c74

Note: SVN reference [4253] has been migrated to Git commit 25cb532348

Note: SVN reference [4260] has been migrated to Git commit 7b2963aaf0

Note: SVN reference [4307] has been migrated to Git commit b418e5d141

Note: SVN reference [4310] has been migrated to Git commit 9b4415fe51

Note: SVN reference [4311] has been migrated to Git commit bbeaa2d022

Note: SVN reference [4319] has been migrated to Git commit 7db44f8e50
 2012-04-26 19:34:57 +00:00
Ole Laursen 7db44f8e50 Only query for regular IETF meetings when calculating cut off dates 
(reported by Ryan Cross).
 - Legacy-Id: 4319
 2012-04-25 11:00:40 +00:00
Henrik Levkowetz 6c27541354 Added a FIXME: for the read_agenda_file() function. Some serious refactoring and generalization is needed here. 
- Legacy-Id: 4302
 2012-04-22 18:09:52 +00:00
Henrik Levkowetz dac11633ff Revert a URL schema change made by olau@iola.dk in [4046] for a reason I can't quite see. This change breaks old URLs. 
- Legacy-Id: 4299
Note: SVN reference [4046] has been migrated to Git commit d6baa38fe5
 2012-04-22 15:15:38 +00:00
Henrik Levkowetz bf718d1b74 Merged [4265] from adam@nostrum.com: 
Migrated HTML agenda to new data model. This has several improvements, as well, such as clearer marking of BOFs.
 - Legacy-Id: 4268
Note: SVN reference [4265] has been migrated to Git commit c113bd0588
 2012-04-05 21:45:01 +00:00
Henrik Levkowetz 484eb75241 Merged [4226] from adam@nostrum.com: 
Updated agenda.ics to use new data model. Also, tons more efficient. Additionally, the description field now includes links to relevant meeting materials.
 - Legacy-Id: 4267
Note: SVN reference [4226] has been migrated to Git commit 740487d69f
 2012-04-05 21:36:00 +00:00
Adam Roach c113bd0588 Migrated HTML agenda to new data model. This has several improvements, as well, such as clearer marking of BOFs. 
- Legacy-Id: 4265
 2012-04-05 19:30:36 +00:00
Adam Roach 740487d69f Updated agenda.ics to use new data model. Also, tons more efficient. Additionally, the description field now includes links to relevant meeting materials. 
- Legacy-Id: 4226
 2012-03-24 18:33:44 +00:00
Henrik Levkowetz dc41de99d0 Merged [4207] from adam@nostrum.com: 
Ported week view over to use the new meeting data model
 - Legacy-Id: 4216
Note: SVN reference [4207] has been migrated to Git commit 6a9c7d1dbb
 2012-03-24 16:43:10 +00:00
Henrik Levkowetz f64142c682 Fix to catch summer/wintertime changes. 
- Legacy-Id: 4210
 2012-03-24 14:28:08 +00:00
Adam Roach 6a9c7d1dbb Ported week view over to use the new meeting data model 
- Legacy-Id: 4207
 2012-03-24 14:16:23 +00:00
Ole Laursen 91a365cbbb Serve week view from /meeting/xx/week-view.html as well to work with 
semi-buggy Javascript on /meeting/xx/agenda.html as well as
/meeting/xx/agenda/.
 - Legacy-Id: 4085
 2012-03-14 19:39:42 +00:00
Ole Laursen 3e3c8a75bc Fix agenda retrieval for plenaries 
- Legacy-Id: 4084
 2012-03-14 19:32:10 +00:00
Ole Laursen 96cd6bc244 Return 1plenary for area of plenaries to get closer to the behaviour 
of the old models, fixes problem with plenaries only being visible in
the week view if GEN is selected.
 - Legacy-Id: 4083
 2012-03-14 19:13:22 +00:00
Henrik Levkowetz 9a6ee2219d Only consider active plenary agenda documents for display in meeting agenda. Look for 'technical' in document name, rather than title, as title could be empty. Fixes #793. 
- Legacy-Id: 4063
 2012-03-07 10:28:05 +00:00
Henrik Levkowetz 1af6a03cf0 Tweak TimeSlot and Session admin pages with more filter and search fields. 
- Legacy-Id: 4062
 2012-03-07 10:19:35 +00:00
Ole Laursen d6baa38fe5 Fix problem with reading agenda files, generate it from the actual 
agenda document rather than trying various combinations of extensions
and upper/lower case
 - Legacy-Id: 4046
 2012-03-06 20:36:14 +00:00
Ole Laursen 140e4bef3f Fix bug in URL, week-view didn't work for /meeting/[somenumber]/agenda/ URLs 
- Legacy-Id: 4045
 2012-03-06 19:52:06 +00:00
Ole Laursen f1c9c7a8dc Return "irtf" as area for the IRTF group to mimic old system better 
- Legacy-Id: 4036
 2012-03-05 20:12:25 +00:00
Ole Laursen 2d640721a5 Refine meeting time proxy to skip session time slots with no session attached. Fixes #785. 
- Legacy-Id: 4034
 2012-03-05 19:28:12 +00:00
Ole Laursen 52a94ef54a Fix bug in __str__ on MeetingTimeProxy, probably harmless 
- Legacy-Id: 4032
 2012-03-05 18:47:25 +00:00
Ole Laursen dbf5e6ab84 Remove a bunch of old admin files, fix a couple of issues with the new ones, add admin for meeting 
- Legacy-Id: 3995
 2012-02-28 17:29:52 +00:00
Ole Laursen 65d3b28707 Make sure unique ids are unique by outputting the time slot ids rather 
than "session + number of session in this meeting"
 - Legacy-Id: 3994
 2012-02-28 14:38:01 +00:00
Ole Laursen 0b3c475432 Fix bugfix to match the IRTF type in the new database 
- Legacy-Id: 3983
 2012-02-27 17:09:08 +00:00
Ole Laursen f46e96c7a1 Fix from Henrik to let RGs show up properly in the agenda 
- Legacy-Id: 3982
 2012-02-27 16:55:55 +00:00
Ole Laursen 29366bf963 Add default = 0 to requested_duration to accomodate non-requested 
sessions and improve __unicode__ for interim meetings
 - Legacy-Id: 3924
 2012-02-15 13:21:32 +00:00
Ole Laursen b6f0fa8af3 Filter out interim meetings for the time being in the proxy 
- Legacy-Id: 3921
 2012-02-10 19:36:46 +00:00
Ole Laursen 1b1cb2f3b5 Fix missing import noticed by Ryan Cross 
- Legacy-Id: 3916
 2012-02-08 20:05:52 +00:00
Ole Laursen 980d4e6444 Move new schema models from redesign/ to ietf/ 
- Legacy-Id: 3855
 2012-01-24 17:17:24 +00:00
Ole Laursen 9a18341f2a Add unique=True to Meeting 
- Legacy-Id: 3847
 2012-01-23 10:53:01 +00:00
Ole Laursen 2d521ee92b Fix some bugs in materials page after meeting refactor 
- Legacy-Id: 3772
 2011-12-14 17:28:54 +00:00
Ole Laursen 7c36e78415 Fix some bugs from the recent meeting refactor 
- Legacy-Id: 3769
 2011-12-14 15:27:45 +00:00
Ole Laursen 02809ffbf1 Model non-group-meeting sessions with sessions (by extending it with a 
name), as a consequence, drop the "other" time slot category and
remove materials on time slots
 - Legacy-Id: 3754
 2011-12-09 13:45:05 +00:00
Ole Laursen 2c81e8d1ed Add support for not-meeting meeting sessions 
- Legacy-Id: 3744
 2011-12-07 11:52:18 +00:00
Ole Laursen 2c374d93db Move meeting submission constants to settings 
- Legacy-Id: 3737
 2011-12-01 12:02:32 +00:00
Ole Laursen 1c0d859a80 Fix problem with __unicode__ on Constraint (spotted by Ryan Cross) 
- Legacy-Id: 3735
 2011-11-30 17:20:03 +00:00
Ole Laursen 5a4c23ea92 Merge with trunk 
- Legacy-Id: 3676
 2011-11-21 16:41:21 +00:00