Commit graph

713 commits

Author SHA1 Message Date
Henrik Levkowetz fa4adeb374 Fixed a number of bad Message.content_type settings.
- Legacy-Id: 17339
2020-02-26 17:05:53 +00:00
Henrik Levkowetz fa9427769a Added cleaning of the session request form's 'comments' field, to convert any html entered to text. Related to [17322].
- Legacy-Id: 17324
Note: SVN reference [17322] has been migrated to Git commit eb88abc394
2020-02-21 21:36:18 +00:00
Henrik Levkowetz eb88abc394 Removed an instance of 'autoescape off' for submitted meeting session comments in a template, since it is not needed in practice, in order to avoid an XSS injection opportunity.
- Legacy-Id: 17322
2020-02-21 15:32:41 +00:00
Henrik Levkowetz 7009605527 Merged in [17273] from rcross@amsl.com:
Update link to session request tool instructions.
 - Legacy-Id: 17282
Note: SVN reference [17273] has been migrated to Git commit 2d97cb65f7
2020-02-06 13:46:16 +00:00
Ryan Cross 2d97cb65f7 Update link to session request tool instructions. Commit ready for merge.
- Legacy-Id: 17273
2020-02-04 21:02:33 +00:00
Henrik Levkowetz 2eafa85b46 Merged in [17217] from olau@iola.dk:
Tighten validation of session conflicts in the session request tool,
preventing conflicts where source = target. Make sure the 'use
previous session' button doesn't carry forward conflicts that are no
longer valid.
Also fix a bug with the group list in the dropdowns being computed
statically at module import time instead of being queried dynamically
upon each page request.
 - Legacy-Id: 17222
Note: SVN reference [17217] has been migrated to Git commit c34fec535f
2020-01-13 14:14:31 +00:00
Ole Laursen c34fec535f Tighten validation of session conflicts in the session request tool,
preventing conflicts where source = target. Make sure the "use
previous session" button doesn't carry forward conflicts that are no
longer valid.

Also fix a bug with the group list in the dropdowns being computed
statically at module import time instead of being queried dynamically
upon each page request.

Commit ready for merge
 - Legacy-Id: 17217
2020-01-10 17:42:43 +00:00
Henrik Levkowetz b14cba5f15 Refactored some document methods to align better with Django's get_absolute_url(), and added Person.get_absolute_uri()
- Legacy-Id: 17189
2020-01-07 13:33:02 +00:00
Henrik Levkowetz 6482254a03 Merged in ^/branch/akayla/irsg/6.113.1.dev0 from peter@akayla.com.
This provides support for IRSG ballots, similar to the IESG ballots support which has been in use for quite some time.  The IRSG ballots differ from IESG ballots in a number of ways, described in detail in the RFP and SoW for this work and implemented here.
 - Legacy-Id: 17164
2019-12-20 15:00:55 +00:00
Peter E. Yee bb7e504d14 12/13 merged into 6.113.1.dev0 with migration ordering failure
- Legacy-Id: 17149
2019-12-13 19:53:45 +00:00
Ole Laursen 173b242e37 Request regular sessions with type session, fix the request test to
check the type
 - Legacy-Id: 17144
2019-12-09 18:20:27 +00:00
Ole Laursen 60a48d4638 Fix bug introduced in previous commit (exclude became filter)
- Legacy-Id: 17143
2019-12-09 18:09:54 +00:00
Ole Laursen 568670c060 Turn sessions into regular sessions and non-sessions into misc.
sessions in the UI and code to avoid ambiguity.

This doesn't change the data in the DB except for uses of
TimeSlotTypeName where 'session' is now 'regular'.
 - Legacy-Id: 17128
2019-12-06 20:02:26 +00:00
Ole Laursen 3957743b85 Move Session.status, .requested, and .requested_by to a new SchedulingEvent
- Legacy-Id: 17122
2019-12-05 12:41:09 +00:00
Ole Laursen 0555879777 Rename Meeting.agenda to Meeting.schedule together with a bunch of
related internal things
 - Legacy-Id: 17051
2019-11-18 17:22:19 +00:00
Henrik Levkowetz b7724c43d7 Changed some # type: ignore statements to work with the latest mypy
- Legacy-Id: 16968
2019-11-05 22:41:18 +00:00
Henrik Levkowetz a288401fd1 Type checking tweaks.
- Legacy-Id: 16866
2019-10-15 16:50:43 +00:00
Henrik Levkowetz 9d4ca615d3 Merged in [16607] from rcross@amsl.com:
Fix issue where third session requests, which rerequire AD approval, get left with approved status, instead of scheduled, after Secretraiat sends out notifications of official schedule.  Fixes #2765.
 - Legacy-Id: 16817
Note: SVN reference [16607] has been migrated to Git commit 9a82586e1b
2019-10-02 20:55:54 +00:00
Henrik Levkowetz bee8d13a57 Removed some test assertions which are incorrect after the previous commit
- Legacy-Id: 16806
2019-10-01 22:13:20 +00:00
Henrik Levkowetz 038e90649d From rcross@amsl.com: Don't copy breaks etc, when creating new Empty Schedule for meetings. Fixes issue #2713.
- Legacy-Id: 16805
2019-10-01 20:30:40 +00:00
Henrik Levkowetz 33e8733b91 Fixed up mypy issues or added type:ignore comments as needed for a clean mypy run.
- Legacy-Id: 16772
2019-09-30 15:42:18 +00:00
Henrik Levkowetz 4ed73d2ba9 Removed unused .py file
- Legacy-Id: 16767
2019-09-30 15:35:03 +00:00
Ryan Cross f950f1b8ea Remove temporary print statements. Commit ready for merge.
- Legacy-Id: 16702
2019-09-03 21:16:10 +00:00
Henrik Levkowetz 8472cf2226 Merged in [16630] from rjsparks@nostrum.com:
Rework how we are labeling constraints to provide a quick-fix for session requests at IETF106. Turned off several javascript functions that added/enforced old (possibly no longer correct) semantics for the session request forms. Fixes #2754.
 - Legacy-Id: 16699
Note: SVN reference [16630] has been migrated to Git commit 10422f87d2
2019-09-03 16:43:12 +00:00
Henrik Levkowetz e021eb8924 Merged in [16629] from rjsparks@nostrum.com:
Removing unused template. I think it was an artifact of the Django 1.2 to 1.6 conversion from 6 years ago.
 - Legacy-Id: 16698
Note: SVN reference [16629] has been migrated to Git commit 798a57c9ab
2019-09-03 14:46:14 +00:00
Henrik Levkowetz b2be7975c9 Merged in [16600] from rjsparks@nostrum.com:
Fixed a subtle bug in the code that converts slides to PDF that was writing back into settings.
 - Legacy-Id: 16645
Note: SVN reference [16600] has been migrated to Git commit b4714f95579efcb5051438239a5df002036c9975
2019-08-10 18:06:40 +00:00
Robert Sparks 10422f87d2 Rework how we are labeling constraints to provide a quick-fix for session requests at IETF106. Turned off several javascript functions that added/enforced old (possibly no longer correct) semantics for the session request forms. Fixes #2754. Commit ready for merge.
- Legacy-Id: 16630
2019-08-07 02:03:15 +00:00
Robert Sparks 798a57c9ab Removing unused template. I think it was an artifact of the Django 1.2 to 1.6 conversion from 6 years ago.
- Legacy-Id: 16629
2019-08-06 21:41:10 +00:00
Ryan Cross 9a82586e1b Fix issue where third session requests, which rerequire AD approval, get left with approved status, instead of scheduled, after Secretraiat sends out notifications of official schedule. Fixes #2765. Commit ready for merge.
- Legacy-Id: 16607
2019-07-31 23:02:20 +00:00
Henrik Levkowetz e03784132d Merged changes from current trunk to Py3 branch.
- Legacy-Id: 16468
2019-07-16 15:36:16 +00:00
Henrik Levkowetz bdc73e771a Python2/3 compatibility: replaced six.ensure_text() with either six.text_type or django's force_text(), depending on the case, and fixed a variable scope issue.
- Legacy-Id: 16461
2019-07-16 13:20:05 +00:00
Henrik Levkowetz 8c6eb3a30a Python2/3 compatibility: Changed the use of open() and StringIO to io.open() etc.
- Legacy-Id: 16458
2019-07-15 19:14:04 +00:00
Henrik Levkowetz ea8c84d2f6 Python2/3 compatibility: used @python_2_unicode_compatible to provide __unicode__() versions of __str__() methods.
- Legacy-Id: 16455
2019-07-15 18:01:26 +00:00
Henrik Levkowetz a5e31c3f40 Py2/3 compatibility: Added __future__ import.
- Legacy-Id: 16452
2019-07-15 15:52:18 +00:00
Henrik Levkowetz 2d7c9629aa Added 'from __future__' imports all over the place, to bring code behaviour into closer alignment between python2 and python3
- Legacy-Id: 16446
2019-07-15 15:40:51 +00:00
Henrik Levkowetz 0679eaa8d4 Removed unused imports.
- Legacy-Id: 16402
2019-07-04 21:06:57 +00:00
Henrik Levkowetz f480799af9 Undid unintentional bulk commit
- Legacy-Id: 16401
2019-07-04 21:04:46 +00:00
Henrik Levkowetz fc09a59950 Added decode() of command pipe output.
- Legacy-Id: 16400
2019-07-04 21:01:39 +00:00
Henrik Levkowetz fbc131c73f Replaced an obsolete file() call with open().
- Legacy-Id: 16396
2019-07-04 20:57:36 +00:00
Henrik Levkowetz f33ecaa1a4 Fixed a test that compared an int with a meeting number string. Changed meeting test data to use meeting number 72 instead of 42, because proceedings code gives 404 for meetings before 65. Changed a number of StringIO() to BytesIO().
- Legacy-Id: 16378
2019-07-04 16:01:32 +00:00
Henrik Levkowetz 8c66e95a57 Test changes to match production group type changes for some special groups.
- Legacy-Id: 16357
2019-07-01 18:30:59 +00:00
Henrik Levkowetz f5ae2541ad Replaced multiple asserts with assertContains().
- Legacy-Id: 16353
2019-07-01 14:09:12 +00:00
Henrik Levkowetz f76d8bf776 Replaced multiple asserts with assertContains().
- Legacy-Id: 16349
2019-07-01 11:53:46 +00:00
Henrik Levkowetz f1172b5647 Replaced multiple asserts with assertContains().
- Legacy-Id: 16348
2019-07-01 11:47:36 +00:00
Henrik Levkowetz 15e74e89cb Converted instances of assertTrue(text in response.content) to the recommended assertContains(response, text), and similar for assertFalse(... in ...)
- Legacy-Id: 16336
2019-06-29 13:43:31 +00:00
Henrik Levkowetz 484dcece5f Changed all model __unicode__() methods to __str__()
- Legacy-Id: 16330
2019-06-28 21:07:08 +00:00
Henrik Levkowetz 3ec7e864be Converted leading tabs to spaces in ietf/**/*.py
- Legacy-Id: 16310
2019-06-27 14:51:02 +00:00
Henrik Levkowetz d7f5c84182 Initial 2to3 patch with added copyright statement updates.
- Legacy-Id: 16309
2019-06-27 14:40:54 +00:00
Henrik Levkowetz f9cd72168f Updated some functions and views in secr/srec/ to use GroupFeatures instead of harcoded lists of group types.
- Legacy-Id: 16301
2019-06-23 11:52:58 +00:00
Henrik Levkowetz da5ff11538 Make session requests also work for ad-hoc groups, which may not have a parent area.
- Legacy-Id: 16300
2019-06-20 21:43:41 +00:00