Commit graph

77 commits

Author SHA1 Message Date
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
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 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
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 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 e03784132d Merged changes from current trunk to Py3 branch.
- Legacy-Id: 16468
2019-07-16 15:36:16 +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 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
Henrik Levkowetz 1504c6b13e Merged in [15328] from rcross@amsl.com:
Give secretariat the ability to cancel non-working group sessions. Fixes #2537.
 - Legacy-Id: 15363
Note: SVN reference [15328] has been migrated to Git commit ec279682d2
2018-07-15 20:08:44 +00:00
Ryan Cross 4ae0982fb0 Fix issue where user can make two session request submissions, corrupting data. Also, ignore deleted session requests in edit view. Commit ready for merge
- Legacy-Id: 15055
2018-04-18 23:23:20 +00:00
Henrik Levkowetz 26bf387356 Replaced direct assignment to m2m fields with .clear() and .set()
- Legacy-Id: 14666
2018-02-21 23:58:25 +00:00
Henrik Levkowetz 2070bbfed6 Merged in [13722] and [13712] from rcross@amsl.com:
Remove all use of request.session from secretariat apps.  Add tests for affected views.  Fixes #1455.
 - Legacy-Id: 13724
Note: SVN reference [13712] has been migrated to Git commit 915b445bcffcd4687fb1677230b98282d22dd9a0

Note: SVN reference [13722] has been migrated to Git commit 3a2cb9d3d846168f75d9796b4e5383bdf10b1f60
2017-06-28 14:55:10 +00:00
Ryan Cross 9a9531d9f6 Change From address of session request notifications from session_request_developers@ietf.org to session-request@ietf.org. Fix requester information in session request cancellation email. Fixes #1621. Commit ready for merge.
- Legacy-Id: 13291
2017-05-09 21:33:14 +00:00
Ryan Cross 4d9bdcad6a Add group field to Roles add form validation. Fixes #2292. Commit ready for merge.
- Legacy-Id: 13276
2017-05-09 00:33:55 +00:00
Henrik Levkowetz 74af0f5658 Replaced another bunch of explicit url names with dotted-path to the view function.
- Legacy-Id: 12849
2017-02-15 22:11:20 +00:00
Henrik Levkowetz aa5e61d958 Updated all urlpatterns to use ietf.utils.urls.url() instead of django's,
in order to autogenerate dotted path url pattern names.  Updated a number
of url reverses to use dotted path, and removed explicit url pattern names
as needed.

Changed some imports to prevent import of ietf.urls before django
initialization was complete.


Changed 3 cases of form classes being curried to functions; django 1.10
didn't accept that.

Started converting old-style middleware classes to new-style middleware
functions (incomplete).

Tweaked a nomcom decorator to preserve function names and attributes, like
a good decorator should.

Replaced the removed django templatetag 'removetags' with our own version
which uses bleach, and does sanitizing in addition to removing explicitly
mentionied html tags.

Rewrote the filename argument handling in a management command which had
broken with the upgrade.
 - Legacy-Id: 12818
2017-02-11 14:43:01 +00:00
Henrik Levkowetz de3976bec0 Merged in Django 1.9 upgrade work from ^/personal/henrik/6.41.1-django-1.9
- Legacy-Id: 12764
2017-01-31 15:13:01 +00:00
Henrik Levkowetz 55b430b525 Merged in [12748] from rcross@amsl.com:
Fixes #2172.  Add Requested Resources and People who must be there, to email notifications of session requests.
 - Legacy-Id: 12757
Note: SVN reference [12748] has been migrated to Git commit eeb35e997d
2017-01-30 23:22:45 +00:00
Henrik Levkowetz 7b95411f58 The context_instance parameter to render_to_response() and render_to_string() is now deprecated. Fixed this, and generally changed the idiom render_to_response('template.html', {}, RequestContext(request)) to the newer and simpler render(request, 'template.html', {}). About 200 instances.
- Legacy-Id: 12637
2017-01-09 21:26:30 +00:00
Henrik Levkowetz 3d6b370c59 Upgraded custom TimedeltaFields to use the builtin DurationField from Django 1.8, and adjusted forms and initialization values accordingly.
- Legacy-Id: 12597
2016-12-20 22:56:34 +00:00
Ryan Cross 10baa54a07 Restrict session request options to groups of type WG,RG or AG. Add new mailtrigger to names fixture. Commit ready for merge.
- Legacy-Id: 11708
2016-07-18 11:39:36 +00:00
Ryan Cross 8737808e4b Fixes Ticket #1791. Secretariat locked out of Session Request Tool. Commit ready for merge
- Legacy-Id: 10339
2015-10-31 04:51:31 +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
Robert Sparks f5b6465e81 mailtoken becomes mailtrigger
- Legacy-Id: 10090
2015-09-17 20:03:45 +00:00
Robert Sparks 90c3426e2f updated mailtoken utilities to match the model refactor. Morphed all the code using the utilities to match. Added paths to get Cc through as needed. Next up: Recipient selection form for the iesg save-and-send-email workflow
- Legacy-Id: 10040
2015-08-23 18:15:06 +00:00
Robert Sparks 23a2ada5f9 checkpoint
- Legacy-Id: 10027
2015-08-18 18:52:22 +00:00
Henrik Levkowetz 1c54a13f68 Merged in [9649] from rjsparks@nostrum.com:
Provide a session type for sessions created to say a group is not meeting. Add a test for the no_meeting view. Fixes #1720.
 - Legacy-Id: 9660
Note: SVN reference [9649] has been migrated to Git commit 0ce13839009aed0c946750989ea0a074517028ba
2015-06-03 16:33:55 +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
Henrik Levkowetz 881c9cb8f6 Provide the IRTF chair with access to the session request tool. Fixes issue #1687.
- Legacy-Id: 9529
2015-04-21 12:36:46 +00:00
Henrik Levkowetz 88300e5d50 Removed emtpy items from the must-be-there list before handing the list to Person.objects.filter(pk__in=...). Fixes issues #1684, #1685
- Legacy-Id: 9528
2015-04-21 11:53:00 +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
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