Commit graph

59 commits

Author SHA1 Message Date
Henrik Levkowetz f2b883d2bb Merged in ^/trunk@17617.
- Legacy-Id: 17618
2020-04-14 17:11:51 +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
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 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
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 3957743b85 Move Session.status, .requested, and .requested_by to a new SchedulingEvent
- Legacy-Id: 17122
2019-12-05 12:41:09 +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 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 3508f59f52 Merged in [15596] from rjsparks@nostrum.com:
improved coverage for several tests.
 - Legacy-Id: 15600
Note: SVN reference [15596] has been migrated to Git commit 6f18ae882532433ba86322b33c34f5f1b0350cb9
2018-10-19 14:27:13 +00:00
Robert Sparks 87bda66740 Converted several secr apps to use factories for tests. Commit ready for merge.
- Legacy-Id: 15568
2018-10-12 22:08:31 +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
Ryan Cross bf3a49466f Improve test coverage for ietf.secr.sreq. Commit ready for merge
- Legacy-Id: 14362
2017-11-11 09:33:27 +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
Robert Sparks 4813177086 Allow the nomcom to collect feedback on arbitrary topics. Fixes #2256 and #1846. Commit ready for merge.
- Legacy-Id: 13474
2017-05-30 19:54:31 +00:00
Lars Eggert 8a70e9773d Fix various "RemovedInDjango20Warning" warnings. Commit ready for merge.
- Legacy-Id: 13112
2017-03-25 19:16:45 +00:00
Henrik Levkowetz ea70381f29 Merged in [12950] from rcross@amsl.com:
Fixes #2219.  Area Group chairs are denied material management access.
 - Legacy-Id: 12951
Note: SVN reference [12950] has been migrated to Git commit c6d1a59aa4
2017-03-02 21:21:07 +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 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
Ryan Cross eeb35e997d Fixes #2172. Add Requested Resources and People who must be there, to email notifications of session requests. Commit ready for merge.
- Legacy-Id: 12748
2017-01-27 23:32:52 +00:00
Henrik Levkowetz d298785fda Merged in ^/branch/amsl/interim@11230, which provides interim meeting management support. Also fixes issues #1961, #1962 and #1964.
- Legacy-Id: 11402
2016-06-17 14:16:27 +00:00
Ryan Cross facead5d95 Add inteirm meeting request disapprove and cancel capabilities
- Legacy-Id: 11135
2016-04-26 23:05:53 +00:00
Henrik Levkowetz 4cac784522 Renamed a bunch of identically named MainTestCase classes.
- Legacy-Id: 10913
2016-03-06 18:18:38 +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
Ryan Cross d130d06948 Fixes Ticket #1794. The session request form validation needs to check that durations have been entered for each requested session. Commit ready for merge
- Legacy-Id: 10342
2015-10-31 06:34:25 +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
Robert Sparks 8a74604a1b Done with the second pass focusing on test coverage. Lots of test tweaks, some new tests, a couple of bugs fixed. The session request code views need to be redone to allow testing.
- Legacy-Id: 10035
2015-08-21 16:39:00 +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
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
Ryan Cross f9d614528b fixes Ticket #1443. Do not allow editing or submitting new session requests when the tool is locked. Commit ready for merge.
- Legacy-Id: 8156
2014-07-20 20:31:08 +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 156b0d4e3a Changed the code to use django's own authentication, instead of http basic auth. This will let people log out, and will also use stronger password hashing than basic auth. Added a login page, and logout links, and links from the logged in username (in the upper right corner) to the user's profile page.
- Legacy-Id: 7580
2014-04-07 18:56:44 +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
Henrik Levkowetz 003691fd86 Merged in [7549] from rcross@amsl.com:
fix tests to work with secauth middleware changes
 - Legacy-Id: 7570
Note: SVN reference [7549] has been migrated to Git commit 0b5fc98290
2014-04-06 14:41:44 +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 0b5fc98290 fix tests to work with secauth middleware changes
- Legacy-Id: 7549
2014-03-27 16:08:27 +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 c4c8effcde Made ietf/secr/sreq pyflakes-clean.
- Legacy-Id: 7491
2014-03-15 23:30:48 +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
Ole Laursen d1782297ab assertEquals -> assertEqual in tests, the former is deprecated
- Legacy-Id: 6964
2013-12-17 12:52:24 +00:00
Ole Laursen f935577f77 Remove some unused references to SimpleUrlTestCase
- Legacy-Id: 6838
2013-12-07 13:30:41 +00:00