Commit graph

157 commits

Author SHA1 Message Date
Robert Sparks 05390ebb7a r19301 on session request notificaiton email was faulty (buffers reverted between test and commit). This corrects it. Commit ready for merge.
- Legacy-Id: 19304
2021-08-26 22:42:37 +00:00
Robert Sparks 5f465caa18 Remove unintended debug statement. Commit ready for merge.
- Legacy-Id: 19303
2021-08-26 22:18:37 +00:00
Robert Sparks 7db98010e2 Include new conflict types in the session request notification email. Fixes #3381. Commit ready for merge.
- Legacy-Id: 19301
2021-08-26 21:51:04 +00:00
Jennifer Richards 336d762123 Allow configuration of group conflict types used for each meeting Fixes #2770. Commit ready for merge.
- Legacy-Id: 19266
2021-07-30 17:50:24 +00:00
Jennifer Richards 66b9c41dcc Add ConstraintNames for chair, tech, and key participant conflicts. Replace temporary UI workaround with proper conflict type handling. Fixes #3083. Commit ready for merge.
- Legacy-Id: 19103
2021-06-09 19:36:27 +00:00
Russ Housley 45dcc10418 Allow IAB Programs to be listed in meeting request conflicts. Ready for merge. Fixes #3270.
- Legacy-Id: 19052
2021-06-01 18:35:54 +00:00
Robert Sparks 3697180cc1 Reverted merge of timezone-aware migration efforts.
- Legacy-Id: 18792
2021-01-12 16:54:20 +00:00
Henrik Levkowetz 774e752a54 Snapshot of timezone-aware datatracker code. Tests pass, and the test-crawler shows only expected differences. Trunk changes merged in up to r18768.
- Legacy-Id: 18770
2020-12-16 23:53:37 +00:00
Robert Sparks 91b2994a9b Merged in [18729] from rcross@amsl.com:
Add argument 'days' to get_meeting() to allow specifying lag time
 - Legacy-Id: 18758
Note: SVN reference [18729] has been migrated to Git commit 3c29c111a4fa474f876ed12f265c5844ebb3c94d
2020-12-11 21:42:51 +00:00
Henrik Levkowetz ac5e88b82b Added a context processor to make settings generally available in page templates. Split the SECRETARIAT_TICKET_EMAIL setting into SECRETARIAT_ACTION_EMAIL and SECRETARIAT_INFO_EMAIL, with different addresses. Updated places with hardcoded ietf-action@ietf.org addresses to use the settings value, and updated some places to use ietf-infor@ietf.org instead of the ietf-action address. Fixes issue #3081.
- Legacy-Id: 18501
2020-09-17 11:10:27 +00:00
Henrik Levkowetz e837e0e2ee Backported a patch to production that changed the secretariat session-request tool session lengths to 60/120 minutes.
- Legacy-Id: 18471
2020-09-08 10:26:34 +00:00
Robert Sparks 2b10465aa7 Convert IRTF area groups into their own group type rather than attempting to overload AG. Fixes #3027. Commit ready for merge.
- Legacy-Id: 18298
2020-07-28 18:54:44 +00:00
Henrik Levkowetz d986c5b227 Merged in [17803] from rcross@amsl.com:
Made various changes to session request form, mostly removal of fields, to support virtual session requests. Also added settings.SECR_VIRTUAL_MEETINGS list.
 - Legacy-Id: 17829
Note: SVN reference [17803] has been migrated to Git commit d90d97d8cc
2020-05-19 12:13:37 +00:00
Henrik Levkowetz bc05e7a8d0 Refactored many instances of msg.get_payload(decode=True).decode('utf-8') and similar to get_payload_text(msg), which uses msg.get_charset() to get the actual charset to do the decoding, in a consistent manner. Also removed some instances of force_str, but more remain.
- Legacy-Id: 17807
2020-05-16 20:20:05 +00:00
Ryan Cross d90d97d8cc Made various changes to session request form, mostly removal of fields, to support virtual session requests. Also added settings.SECR_VIRTUAL_MEETINGS list.
- Legacy-Id: 17803
2020-05-15 23:48:06 +00:00
Robert Sparks fb8e5c6842 Allow IAB programs to use normal meeting mechanics. Fixes #2970. Commit ready for merge.
- Legacy-Id: 17764
2020-05-08 21:11:25 +00:00
Henrik Levkowetz f2b883d2bb Merged in ^/trunk@17617.
- Legacy-Id: 17618
2020-04-14 17:11:51 +00:00
Henrik Levkowetz b143dd407f Merged in ^/branch/dash/automatic-scheduler@17395, which adds groundwor for
upcoming automatic scheduling assistance:

 . Added a management command to create a dummy IETF 999 meeting.

 . Added display of new constraints and joint sessions to agenda builder
   interface.

 . The new timerange, time_relation and wg_adjacent constraints, along with
   the joint_with_groups option, are now reflected in the special requests
   field.  This allows them to be taken into account while scheduling
   sessions.

 . Clarified the wording in the session request form regarding conflicts with
   BOFs.

 . Added support for structured entry and storage of joint sessions in
   meetings:

   - Also adds additional tests for the SessionForm
   - Fixes a javascript error in session requests for non-WG groups,
     that could cause incorrect form behaviour.
   - Expands the tests added in [17289] a bit.

 . Added support for the timerange, wg_adjacent and time_relation constraints.
   This adds three new constraints to the database and relevant UIs:

   - timerange: "This WG can't meet during these timeframes"
   - wg_adjacent: "Schedule adjacent to another WG (directly following,
     no breaks, same room)"
   - time_relation: schedule the two sessions of one WG on subsequent
     days or with at least one day seperation
 - Legacy-Id: 17605
Note: SVN reference [17289] has been migrated to Git commit a227813dc5
2020-04-08 20:41:29 +00:00
Henrik Levkowetz f10ddadc0e Merged in changes from trunk up to r17584.
- Legacy-Id: 17593
2020-04-07 16:02:52 +00:00
Henrik Levkowetz 81cefbd859 Merged in [17492] from rcross@amsl.com:
On session request form make Special Requests field smaller and display 200 character limit. Fixes #2875.
 - Legacy-Id: 17514
Note: SVN reference [17492] has been migrated to Git commit a99c37cd47
2020-03-22 23:00:55 +00:00
Henrik Levkowetz d78379054c Merged in [17484] from valery@smyslov.net:
When requesting a new WG session, and retrieving information about the previous session, look back to the previous time the group met, instead of simply checking the previous IETF meeting and maybe not finding any information to retrieve.
 - Legacy-Id: 17504
Note: SVN reference [17484] has been migrated to Git commit 88f11669fd
2020-03-22 15:19:23 +00:00
Ryan Cross a99c37cd47 On session request form make Special Requests field smaller and display 200 character limit. Fixes #2875. Commit ready for merge.
- Legacy-Id: 17492
2020-03-21 21:27:18 +00:00
Valery Smyslov 88f11669fd #2882
- Legacy-Id: 17484
2020-03-21 17:25:20 +00:00
Henrik Levkowetz 726fcbf27d Removed all __future__ imports.
- Legacy-Id: 17391
2020-03-05 23:53:42 +00:00
Henrik Levkowetz e9a37d8ac8 Removed six.text_type(), changed six.moves.urllib to plain urllib, and removed now unused six imports.
- Legacy-Id: 17385
2020-03-05 14:41:41 +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
Sasha Romijn 825a054d19 Add support for structured entry and storage of joint sessions in meetings.
- Also adds additional tests for the SessionForm
- Fixes a javascript error in session requests for non-WG groups,
  that could cause incorrect form behaviour.
- Expands the tests added in [17289] a bit.
 - Legacy-Id: 17321
Note: SVN reference [17289] has been migrated to Git commit a227813dc5
2020-02-21 13:27:11 +00:00
Sasha Romijn 1bfcf2e699 Fix issue in [17289] where wg_adjacent could be shown as a conflict.
- Legacy-Id: 17293
Note: SVN reference [17289] has been migrated to Git commit a227813dc5
2020-02-14 13:39:42 +00:00
Sasha Romijn a227813dc5 Add support for the timerange, wg_adjacent and time_relation constraints.
This adds three new constraints to the database and relevant UIs:
- timerange: "This WG can't meet during these timeframes"
- wg_adjacent: "Schedule adjacent to another WG (directly following,
  no breaks, same room)"
- time_relation: schedule the two sessions of one WG on subsequent
  days or with at least one day seperation
 - Legacy-Id: 17289
2020-02-12 10:42:38 +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
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 a288401fd1 Type checking tweaks.
- Legacy-Id: 16866
2019-10-15 16:50:43 +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
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
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 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 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 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 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