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

583 commits

Author SHA1 Message Date
Henrik Levkowetz d8413d5d28 Changed a helper function meeting_updated() to a method on Meeting, and provided it as a synthetic attribute on the /api/v1/meeting/meeting/ endpoints of the JSON API. 
- Legacy-Id: 10611
 2015-12-19 01:52:13 +00:00
Henrik Levkowetz cf7d794b09 Modified the test data to use some AD and WG chair names that contain non-ascii characters, and fixed test issues found. 
- Legacy-Id: 10418
 2015-11-04 07:34:56 +00:00
Henrik Levkowetz 5c3d2e4507 Updated country and timezone choices. 
- Legacy-Id: 10370
 2015-11-03 03:02:48 +00:00
Henrik Levkowetz a5ee6064b9 Merged in [10348] from rcross@amsl.com: 
Add more information to Secretariat session recordings view.
 - Legacy-Id: 10364
Note: SVN reference [10348] has been migrated to Git commit 8c82fef683
 2015-11-02 04:59:30 +00:00
Henrik Levkowetz 143b8cc646 Fixed an issue with [10344], where the numberless /meeting/agenda/ would redirect to a non-existing proceedings URL. 
- Legacy-Id: 10360
Note: SVN reference [10344] has been migrated to Git commit 893988e45e
 2015-11-01 22:49:07 +00:00
Ryan Cross 8c82fef683 Add more information to Secretariat session recordings view. Commit ready for merge 
- Legacy-Id: 10348
 2015-10-31 09:00:15 +00:00
Robert Sparks 893988e45e Return more sensible results for agendas for old meetings. Fixes #1062. Commit ready for merge. 
- Legacy-Id: 10344
 2015-10-31 07:32:47 +00:00
Henrik Levkowetz 6da7ec17db Merged in personal/henrik/6.7.2.dev0-schemafix [10297] from henrik@levkowetz.com: 
Renamed class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and renamed reverse relationships involving this class appropriately.  Accompanying changes in javascript and templates.  Migrations to match.
 - Legacy-Id: 10299
Note: SVN reference [10297] has been migrated to Git commit 71dec7a692
 2015-10-27 15:23:00 +00:00
Ole Laursen 86c3a430d1 Merge in ^/branch/iola/event-saving-refactor-r10076, fixing a few problems 
- Legacy-Id: 10298
 2015-10-27 10:37:06 +00:00
Henrik Levkowetz 71dec7a692 Moved forward to 6.7.2.dev0 the changes to rename class ScheduledSession to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and rename reverse relationships involving this class appropriately. Accompanying changes in javascript and templates. Migrations to match. 
- Legacy-Id: 10297
 2015-10-26 22:45:26 +00:00
Henrik Levkowetz 61ca4d2b5b Better fix, replacing [10294]. 
- Legacy-Id: 10296
Note: SVN reference [10294] has been migrated to Git commit c760822e04
 2015-10-26 22:42:55 +00:00
Henrik Levkowetz c760822e04 Fix a bug in meeting.ajax.constraint_json(). 
- Legacy-Id: 10294
 2015-10-26 19:53:14 +00:00
Henrik Levkowetz cfdd6ec69e Tweaked the anchor ids for agenda timeslots to avoid identical ids for different slots. 
- Legacy-Id: 10130
 2015-10-02 15:01:03 +00:00
Ole Laursen 873af386df Summary: Return a friendlier error in case the room view is accessed 
before the meeting is properly defined, this also fixes a problem with
the crawler
 - Legacy-Id: 10124
 2015-10-02 11:48:35 +00:00
Ole Laursen 6f044eea08 Summary: Move definition of document names and group acronyms to 
settings.URL_REGEXPS, partly to cleanup the urls.py files, partly to
make sure that all URL patterns agree on what constitutes a name
 - Legacy-Id: 10114
 2015-10-01 14:16:16 +00:00
Henrik Levkowetz 30a518a3d0 Do utf-8 encoding of the fields in the JSON blob for meeting sessions. Fixes issue #1790 
- Legacy-Id: 10099
 2015-09-24 10:46:14 +00:00
Henrik Levkowetz a4c49e09df Merged in [10062] from olau@iola.dk: 
Summary: Fixed problem with timeslot.location = None in agenda_csv.
 - Legacy-Id: 10070
Note: SVN reference [10062] has been migrated to Git commit 129cccb88f
 2015-08-30 09:32:18 +00:00
Ole Laursen 129cccb88f Summary: Fixed problem with timeslot.location = None in agenda_csv. 
Commit ready for merge.
 - Legacy-Id: 10062
 2015-08-26 07:52:05 +00:00
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk: 
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
 2015-08-10 19:46:11 +00:00
Henrik Levkowetz 47c9792ea5 Added a very simple html version of the json API, to make it easier to explore the api manually. 
- Legacy-Id: 9992
 2015-08-09 16:30:20 +00:00
Henrik Levkowetz 2fe8dcb4c2 Added a very simple html version of the json API, to make it easier to explore the api manually. 
- Legacy-Id: 9991
 2015-08-09 16:28:55 +00:00
Henrik Levkowetz 24bc3a3e85 Make the selenium tests work with statifiles. 
- Legacy-Id: 9990
 2015-08-08 21:08:03 +00:00
Henrik Levkowetz 83bef1d160 Merged in [9813] from rjsparks@nostrum.com: 
Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links.
 - Legacy-Id: 9825
Note: SVN reference [9813] has been migrated to Git commit 2b7f7dec52
 2015-07-20 13:13:09 +00:00
Robert Sparks 2b7f7dec52 Add navigation to the new secretariat agenda tools. Change the buttons at the top of the agenda.html page to links. Commit ready to merge. 
- Legacy-Id: 9813
 2015-07-19 08:02:09 +00:00
Henrik Levkowetz eb522faa25 Merged in [9789] from lars@netapp.com: 
HTML agendas need to be valid HTML5 document.
 - Legacy-Id: 9811
Note: SVN reference [9789] has been migrated to Git commit d633fdc924a0130da98a7dc79768886d95002938
 2015-07-18 16:35:32 +00:00
Henrik Levkowetz c41a079d4f Merged in [9735] from lars@netapp.com: 
More HTML fixes identified by test-crawl --vnu.
 - Legacy-Id: 9767
Note: SVN reference [9735] has been migrated to Git commit 08d958e7cd9cf4949a688e20046bd61855e00361
 2015-07-18 09:18:54 +00:00
Robert Sparks 609f368ce1 Still clunky but far enough along for sprinters to play with and comment on 
- Legacy-Id: 9720
 2015-07-15 02:13:48 +00:00
Henrik Levkowetz 34a1814b42 Updated a test in ietf.meeting.tests_views.MeetingTests to reflect the updated markup associated related to issue #1743. 
- Legacy-Id: 9710
 2015-07-09 13:37:09 +00:00
Henrik Levkowetz b49a452595 Merged in [9651] from rjsparks@nostrum.com: 
Adds a graphical overview of each day by room for the secretariat to assist with scheduling additional meetings.
 - Legacy-Id: 9674
Note: SVN reference [9651] has been migrated to Git commit 06a0e2b6481fe909f6620ed951353eaf437321ec
 2015-06-22 19:33:15 +00:00
Ole Laursen acda84208d Summary: Make the meeting agenda code use the historic info available 
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.

Fixes #1088. Branch ready for merge.
 - Legacy-Id: 9669
 2015-06-17 13:37:16 +00:00
Henrik Levkowetz 213e769d76 Updated the api resources file with the new meeting model fields. 
- Legacy-Id: 9609
 2015-05-07 19:58:07 +00:00
Robert Sparks 4e1b3b2888 let the IAB see the new pages 
- Legacy-Id: 9600
 2015-05-04 15:10:34 +00:00
Robert Sparks 0ba095e229 remove some dead code 
- Legacy-Id: 9598
 2015-05-04 13:25:57 +00:00
Robert Sparks 525ad030ab some tweaks to the history 
- Legacy-Id: 9597
 2015-05-04 13:09:41 +00:00
Robert Sparks 17b928b94b checkpoint: added room functional description, backfilled ietf92 meeting data, repaired session material views, added tests 
- Legacy-Id: 9596
 2015-05-01 22:31:30 +00:00
Robert Sparks 303e886ee5 pulled several migrations from trunk and reordered the ones here to match 
- Legacy-Id: 9594
 2015-04-30 22:12:18 +00:00
Robert Sparks 72b85fc1c7 checkpoint: views by type working 
- Legacy-Id: 9592
 2015-04-30 21:44:45 +00:00
Robert Sparks 1e30120710 checkpoint. Model changes done and UI tweaked to match. 
- Legacy-Id: 9588
 2015-04-30 15:57:48 +00:00
Robert Sparks 65f0fed7a7 checkpointing some css/html noodling before tearing into models 
- Legacy-Id: 9587
 2015-04-29 14:39:17 +00:00
Robert Sparks b0ce25aa44 clean merge forward 
- Legacy-Id: 9584
 2015-04-27 20:24:40 +00:00
Henrik Levkowetz acc2c59920 Updated a bunch of links from http: to https: based on a patch from lars@netapp.com. 
- Legacy-Id: 9556
 2015-04-24 21:47:12 +00:00
Henrik Levkowetz d59af2aa0f Adapt session_draft_list() code to handle the case when there is multiple agendas for a given group acronym. Fixes some server 500 results when trying to get pdf bundles for the plenary sessions for ietf 71. 
- Legacy-Id: 9502
 2015-04-15 12:58:44 +00:00
Henrik Levkowetz 02cd366ff0 Merged in trunk@9440, containing the changes for version 5.13.1; and updated tests which look at HTML content to work with the facelift changes. 
- Legacy-Id: 9446
 2015-04-11 18:24:20 +00:00
Henrik Levkowetz 2cf0c74561 Merged in [9351] from rjsparks@nostrum.com: 
Remove sessonly, replacing the idea with a separate State. Add tests checking how materials show on agenda views.
 - Legacy-Id: 9430
Note: SVN reference [9351] has been migrated to Git commit a6c64d2b12
 2015-04-09 19:46:04 +00:00
Henrik Levkowetz bf9d668c3e Changed from using an otherwise unused css class as content container selector in tests, to instead using an explicit css id as selector. 
- Legacy-Id: 9394
 2015-04-04 08:57:39 +00:00
Henrik Levkowetz 625347cd2f Merged trunk@9354 to facelift copy 
- Legacy-Id: 9357
 2015-04-02 06:51:34 +00:00
Robert Sparks a6c64d2b12 Remove sessonly, replacing the idea with a separate State. Add tests checking how materials show on agenda views. Commit ready for merge. 
- Legacy-Id: 9351
 2015-04-01 16:00:05 +00:00
Henrik Levkowetz 2f54511763 Changed all explicitly set HttpResponse content_types to specify charset. 
Django sets charset if you don't specify a content_type; if you specify
one you also must add a charset specification (if you want one).  
Fixes issue #1647.
 - Legacy-Id: 9348
 2015-03-26 21:35:21 +00:00
Robert Sparks 8f0b8a9225 Checkpoint for demonstration/discussion in Dallas. More development expected afterwards. 
- Legacy-Id: 9250
 2015-03-19 18:41:02 +00:00
Henrik Levkowetz 6f285a12f4 Changed the handling of some test directory creation and removal code, to be more consistent. Fixed a problem where a test didn't create and remove a test directory it used. 
- Legacy-Id: 9203
 2015-03-15 16:01:15 +00:00
Henrik Levkowetz b56580b847 Added tests for the presence of a VTIMEZONE section in generated agenda iCalendar files. 
- Legacy-Id: 9191
 2015-03-13 16:06:16 +00:00
Henrik Levkowetz cb70eb6a88 Removed a superfluous import. 
- Legacy-Id: 9169
 2015-03-08 14:33:50 +00:00
Henrik Levkowetz 29c674ca59 Captured the change in ScheduledSession sort order in a migration. 
- Legacy-Id: 9164
 2015-03-08 11:49:03 +00:00
Henrik Levkowetz 4dbdf475fa Merged in [9141] from rjsparks@nostrum.com: 
Fix ordering issue on agenda.html.
 - Legacy-Id: 9150
Note: SVN reference [9141] has been migrated to Git commit 29ac6363a1
 2015-03-04 19:16:21 +00:00
Henrik Levkowetz 7619186e6a Added a field capturing changed information for the idsubmission-cutoff-related fields of Meeting. 
- Legacy-Id: 9148
 2015-03-04 17:51:46 +00:00
Henrik Levkowetz 86997e1e95 Turned the api.py file into a module. Moved the makeresources management command to the api module. Added some api tests. Added crawling of api files to the test-crawler. Adjusted some resource files discovered by the test suite and test-crawler. Removed a bunch of empty model files. 
- Legacy-Id: 9144
 2015-03-03 20:23:36 +00:00
Robert Sparks 29ac6363a1 Fix ordering issue on agenda.html. Commit ready for merge 
- Legacy-Id: 9141
 2015-03-01 16:08:02 +00:00
Henrik Levkowetz 048319edbc Merged in [9097] from rcross@amsl.com: 
Fixes #1605.  Editing session request causes KeyError.
 - Legacy-Id: 9120
Note: SVN reference [9097] has been migrated to Git commit a660c433bb
 2015-02-24 18:44:00 +00:00
Henrik Levkowetz ca8d554b78 Undid previous commit -- it contained too much. 
- Legacy-Id: 9118
 2015-02-24 18:31:53 +00:00
Henrik Levkowetz 2b73f24c94 Merged in [9097] from rcross@amsl.com: 
Fixes #1605.  Editing session request causes KeyError.
 - Legacy-Id: 9117
Note: SVN reference [9097] has been migrated to Git commit a660c433bb
 2015-02-24 18:29:45 +00:00
Henrik Levkowetz fed0e17ac1 Made the selector for Agenda.groups() match that of Agenda.area_list() by adding parent__isnull=False. Without this, the two won't match if split by area. Fixes issue #1607. 
- Legacy-Id: 9108
 2015-02-23 12:21:00 +00:00
Henrik Levkowetz 298adf3e20 Added 4 new fields to the meeting class, to hold draft submission cutoff information for the meeting. On request, changed the presentation of the cutoff times to show the last submission time, rather than the beginning of the cutoff time. Changed the cutoff hour format to support full timedelta information, not just a given hour (this was necessary in order to be able to set the requested 23:59:59 submission stop time). 
- Legacy-Id: 9107
 2015-02-21 20:48:29 +00:00
Ryan Cross a660c433bb Fixes #1605. Editing session request causes KeyError. Commit ready for merge. 
- Legacy-Id: 9097
 2015-02-17 19:55:54 +00:00
Henrik Levkowetz 071dfc6f8e Cleanup after Django 1.7 migration 
- Legacy-Id: 9082
 2015-02-12 16:38:01 +00:00
Ole Laursen a225fd5069 Make new branch from trunk and merge facelift-r9007 into it, fixing a few merge conflicts 
- Legacy-Id: 9072
 2015-02-12 10:43:52 +00:00
Henrik Levkowetz 7ecfac6308 Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x. 
- Legacy-Id: 9028
 2015-02-08 21:16:44 +00:00
Henrik Levkowetz 028b7e315a Reverted to [9025] because commit [9026] failed (it was incomplete with a broken working dir). 
- Legacy-Id: 9027
Note: SVN reference [9026] has been migrated to Git commit 4a3749a66b
 2015-02-08 20:03:16 +00:00
Henrik Levkowetz 4a3749a66b Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x. 
- Legacy-Id: 9026
 2015-02-08 19:16:46 +00:00
Ole Laursen eccd8d27c4 Make new branch from trunk (r9007) and merge facelift-r8876 into it, fixing a few merge conflicts 
- Legacy-Id: 9014
 2015-02-06 14:08:34 +00:00
Henrik Levkowetz 375b8d8d95 Added an admin view for the ResourceAssociation class. 
- Legacy-Id: 9013
 2015-02-06 12:34:11 +00:00
Robert Sparks 9421ea9b93 Unbroke week-view, but only by compromising on whether to show things like the terminal room 
- Legacy-Id: 9004
 2015-02-05 21:16:56 +00:00
Ole Laursen ea33e0e3b7 Summary: Fix a missing hide_menu in agenda edit, also delete some now 
unused blocks
 - Legacy-Id: 8995
 2015-02-05 15:48:17 +00:00
Robert Sparks 61a0059d06 checkpoint before trying to fix the static agenda page 
- Legacy-Id: 8972
 2015-02-04 20:47:40 +00:00
Ole Laursen 6ee6a3968f Summary: Remove test of specialized mobile template which is no more 
- Legacy-Id: 8952
 2015-02-02 17:13:07 +00:00
Ole Laursen 8de3bc1ac3 Summary: Add a couple of hidden-xs/visible-xs classes to the agenda 
table to make it work on a smart phone, this seem to cover most of the
intended goal with m_agenda.html, so delete it instead of facelifting it
 - Legacy-Id: 8950
 2015-02-02 16:19:27 +00:00
Ole Laursen 756a972113 Move meeting agenda editing over to new facelifted base template, although without actually facelifting the contents 
- Legacy-Id: 8946
 2015-01-29 17:53:56 +00:00
Ole Laursen e6238aa721 Facelift the relatively trivial meeting pages 
- Legacy-Id: 8942
 2015-01-28 14:28:46 +00:00
Ole Laursen 4087a9837f End help_texts with period consistently - the default error rendering in the bootstrap3 library depends on it 
- Legacy-Id: 8940
 2015-01-28 13:25:21 +00:00
Robert Sparks 47901e8555 Checkpoint: by-room view and basic leadership meetings support 
- Legacy-Id: 8930
 2015-01-27 19:15:25 +00:00
Robert Sparks 82bc8f06e1 Restrict the gathering of ads for past meetings to groups that are areas. Commit ready for merge. 
- Legacy-Id: 8924
 2015-01-26 23:35:32 +00:00
Robert Sparks 8686fd2a4e simple display fix, already in trunk 
- Legacy-Id: 8902
 2015-01-23 17:31:04 +00:00
Ole Laursen d0999c8b5e Merge facelift-r8510 branch with trunk. The IPR tool still has some non-facelifted parts and ideosyncracies. Fix a couple of minor bugs (including infamous empty licensing choice) in the IPR code, and port the IPR views to use the render shortcut. 
- Legacy-Id: 8896
 2015-01-22 17:38:05 +00:00
Henrik Levkowetz 49d86d691b Merged in [8861] from rcross@amsl.com: 
Changes to allow upload of bluesheets in materials upload page.  Primarily for use with Interim meetings.
 - Legacy-Id: 8891
Note: SVN reference [8861] has been migrated to Git commit 40efbf4f57
 2015-01-21 20:32:18 +00:00
Henrik Levkowetz 71057d309a From rjsparks@nostrum.com: Fixed Room.__unicode__() to handle capacity None. 
- Legacy-Id: 8864
 2015-01-14 17:18:40 +00:00
Ryan Cross 40efbf4f57 Changes to allow upload of bluesheets in materials upload page. Primarily for use with Interim meetings. Commit ready for merge. 
- Legacy-Id: 8861
 2015-01-12 18:45:50 +00:00
Ryan Cross e686c5c7f5 Allow upload of bluesheets via materials upload interface 
- Legacy-Id: 8857
 2015-01-09 21:29:57 +00:00
Henrik Levkowetz 30b5d6f229 Added admin support for meeting.models.ResourceAssociation. 
- Legacy-Id: 8834
 2014-12-22 20:11:54 +00:00
Henrik Levkowetz 25eb00c925 New django-1.7 initial migrations. Circular references exist, requiring explicit --fake migration for doc, dbtemplate and community apps. 
- Legacy-Id: 8823
 2014-12-22 17:07:38 +00:00
Henrik Levkowetz dd15785936 Removing south migrations as part of the django 1.7 changeover to builtin migrations. 
- Legacy-Id: 8820
 2014-12-22 16:44:35 +00:00
Henrik Levkowetz 5133e59c9b Merged in [8711] from rjsparks@nostrum.com:\n Added functionality for management of group materials, 
focusing on groups of type 'team'.
* Simplifies managing the Abstract for uploaded group materials. 
  Displays the abstract on the groups materials page
* Provides SessionPresentation: a binding between 
  Document and Session objects, that tracks doc version.
* Adds helpers for finding upcoming sessions, and the 
  most recent SessionPresentations whose sessions have passed
* Generalizes the snippet concept (as a templatetage) used 
  in the history tab for use on other pages
* Adds a variant of the snippet that can be styled as an edit link
* Provides several ways to address sessions, using sequence, 
  dates, group acronyms, and day of week
* Adds a 'Materials Manager' Role
 - Legacy-Id: 8765
Note: SVN reference [8711] has been migrated to Git commit b4448a8faa
 2014-12-18 18:47:14 +00:00
Henrik Levkowetz 770b36d575 Added generated (and sometimes manually tweaked) resources.py files. 
- Legacy-Id: 8744
 2014-12-14 20:33:25 +00:00
Robert Sparks b4448a8faa Added functionality for management of group materials, 
focusing on groups of type 'team'.

* Simplifies managing the Abstract for uploaded group materials. 
  Displays the abstract on the groups materials page
* Provides SessionPresentation: a binding between 
  Document and Session objects, that tracks doc version.
* Adds helpers for finding upcoming sessions, and the 
  most recent SessionPresentations whose sessions have passed
* Generalizes the snippet concept (as a templatetage) used 
  in the history tab for use on other pages
* Adds a variant of the snippet that can be styled as an edit link
* Provides several ways to address sessions, using sequence, 
  dates, group acronyms, and day of week
* Adds a 'Materials Manager' Role

Commit ready for merge.
 - Legacy-Id: 8711
 2014-11-25 00:09:05 +00:00
Henrik Levkowetz c462e63adb Added settings for the PhantomJS ghostdriver.log and the temporary meeting materials directory used during testing, so that it's possible to place them in other places than the working copy. 
- Legacy-Id: 8646
 2014-11-12 01:45:58 +00:00
Henrik Levkowetz 334d11837a Merged in [8614] from harald@alvestrand.no: 
Second try on #1425. Returns to agenda and uses message.
    Builds on [8604]. Fixes issue #1425, agenda view save-as.
 - Legacy-Id: 8621
Note: SVN reference [8604] has been migrated to Git commit c0c608ae1c

Note: SVN reference [8614] has been migrated to Git commit 502dede548
 2014-11-09 02:15:18 +00:00
Harald T. Alvestrand 502dede548 Second try on #1425. Returns to agenda and uses message. Commit ready for merge. 
- Legacy-Id: 8614
 2014-11-09 01:21:16 +00:00
Harald T. Alvestrand c0c608ae1c Fixed agenda view save-as. Fixes #1425. Commit ready for merge. 
- Legacy-Id: 8604
 2014-11-08 23:11:03 +00:00
Ole Laursen 87870ca954 Fix more test errors - now only two not yet fully ported views remain 
- Legacy-Id: 8571
 2014-11-03 16:39:41 +00:00
Robert Sparks c05d734cf3 one more tweak before refactoring 
- Legacy-Id: 8455
 2014-10-21 22:38:06 +00:00
Robert Sparks 2f6799ece6 Have working selectors for sessions related to a meeting and sessions related to a document, views for listing such sections that can be edited, and an edit form for changing the presented version. Checkpointing before big refactor to move the URI components around 
- Legacy-Id: 8453
 2014-10-21 21:16:27 +00:00
Robert Sparks e889177a32 merged forward 
- Legacy-Id: 8432
 2014-10-16 15:07:33 +00:00
Lars Eggert a4daf2630c Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift 
Conflicts:
	ietf/doc/templatetags/ietf_filters.py
	ietf/doc/views_charter.py
	ietf/templates/doc/charter/edit_notify.html
	ietf/templates/doc/charter/edit_telechat_date.html
	ietf/templates/doc/document_ballot_content.html
	ietf/templates/doc/document_history.html
	ietf/templates/doc/edit_notify.html
	ietf/templates/doc/edit_telechat_date.html
	ietf/templates/doc/notify.html
	ietf/templates/group/concluded_groups.html
 - Legacy-Id: 8429
 2014-10-14 11:48:57 +00:00
Henrik Levkowetz 272c738471 Added migration erroneously not included in earlier merge. 
- Legacy-Id: 8393
 2014-10-12 19:56:27 +00:00
Henrik Levkowetz f3afb556c2 Merged in [8156] and [8320] from rcross@amsl.com: 
Do not allow editing or submitting new session requests when the tool is locked.  Fixes Ticket #1443.
 - Legacy-Id: 8391
Note: SVN reference [8156] has been migrated to Git commit f9d614528b

Note: SVN reference [8320] has been migrated to Git commit faa6469e27
 2014-10-12 19:17:51 +00:00
Robert Sparks 19b31576eb Add the owners email address to the json path for schedule objects. Fixes ticket #1492. Commit ready for merge. 
- Legacy-Id: 8355
 2014-09-23 21:39:09 +00:00
Robert Sparks 67782ade34 merge forward complete 
- Legacy-Id: 8354
 2014-09-23 15:48:27 +00:00
Robert Sparks c3f460cbe9 Refactored history snippets for general use 
Moved from VersionedMaterials to SessionPresentation for the through table name
Added the abstract and most recent presentation to the documents on the group materials page
Working snapshot before building historic edu-team documents
 - Legacy-Id: 8349
 2014-09-19 21:33:30 +00:00
Henrik Levkowetz 8b8a282730 Merged in [8229] from rjsparks@nostrum.com, with minor tweaks: 
From mcr@sandelman.ca:
    Refactor to remove dajaxice.
    Modified the URLs that address schedules:
      - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
      - urls to a given schedule include the schedule owner (by email address)
    Corrected issue that prevented deleting sessions.
    Changed comment mechanism in timeslot_edit.js
    Migration to change the email address for (System)
  Fixes bug #1426
 - Legacy-Id: 8319
Note: SVN reference [8229] has been migrated to Git commit fc512680d8
 2014-09-18 20:27:28 +00:00
Henrik Levkowetz cbb5b84652 Merged in [8209] from rjsparks@nostrum.com:\n Fixed several places where files were not being closed. 
- Legacy-Id: 8315
Note: SVN reference [8209] has been migrated to Git commit 4aae3ff6785ca2649e54a212bd669369950f4b86
 2014-09-16 19:48:30 +00:00
Robert Sparks 75b94bd114 sketch that uses a through table, preserving most, but not all, of the current interface 
- Legacy-Id: 8302
 2014-09-09 21:56:33 +00:00
Robert Sparks fc512680d8 From mcr@sandelman.ca: 
Refactor to remove dajaxice.
  Modified the URLs that address schedules:
    - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
    - urls to a given schedule include the schedule owner (by email address)
  Corrected issue that prevented deleting sessions.
  Changed comment mechanism in timeslot_edit.js
  Migration to change the email address for (System)

  Fixes bug #1426

Commit ready to merge
 - Legacy-Id: 8229
 2014-07-31 22:13:01 +00:00
Henrik Levkowetz 660bd42ccc Merged in [8137] from rjsparks@nostrum.com: 
First automated javascript test using PhantomJS and Selenium.
 - Legacy-Id: 8151
Note: SVN reference [8137] has been migrated to Git commit 2db4a3b270
 2014-07-20 14:54:47 +00:00
Robert Sparks 2db4a3b270 First automated javascript test using PhantomJS and Selenium. Commit ready to merge 
- Legacy-Id: 8137
 2014-07-19 20:50:40 +00:00
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