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

247 commits

Author SHA1 Message Date
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
Ryan Cross c046739045 allow Team Chairs access to proceedings. Commit ready for merge. 
- Legacy-Id: 8155
 2014-07-20 17:17:31 +00:00
Ryan Cross 4db0adc86d fix bug where ScheduledSession objects still being created without related session. Commit ready for merge. 
- Legacy-Id: 8154
 2014-07-20 15:23:42 +00:00
Ryan Cross d6422c0c93 grant IETF Trust Chair permissions for Announcement Tool. commit ready for merge. 
- Legacy-Id: 8045
 2014-07-03 19:35:38 +00:00
Henrik Levkowetz 09f654b1f4 Merged in branch/iola/team-support from olau@iola.dk. This generalises and extends the group support for WGs and RGs so that also other groups, such as for instance the Edu Team, can have pages. 
- Legacy-Id: 8013
 2014-07-02 19:30:07 +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 27e939380d Merged [7911] from rcross@amsl.com: fix problem using non-ascii names in session request notification email. 
- Legacy-Id: 7930
Note: SVN reference [7911] has been migrated to Git commit e58b72209a
 2014-06-24 21:10:54 +00:00
Ryan Cross e58b72209a fix problem using non-ascii names in session request notification email. Commit ready for merge. 
- Legacy-Id: 7911
 2014-06-12 21:44:35 +00:00
Ryan Cross 61b1755ae5 Change Type field default on groups search form, from WG to unset. Commit ready for merge 
- Legacy-Id: 7843
 2014-06-03 21:44:07 +00:00
Ole Laursen 97e6cebe91 Don't show charter for group types without chartering processes 
- Legacy-Id: 7795
 2014-05-28 15:58:03 +00:00
Ole Laursen d16bdb3723 Add support for editing Group.description in Secretariat tools 
- Legacy-Id: 7767
 2014-05-22 15:08:37 +00:00
Henrik Levkowetz 58cc1f33b4 Merged [7740] from rjsparks@nostrum.com: Fixed a crash when requesting sessions for groups that do not have ADs. Applied to production as 2014-05-13-sreq-rg.patch . 
- Legacy-Id: 7764
Note: SVN reference [7740] has been migrated to Git commit c64243ba31
 2014-05-20 20:29:24 +00:00
Henrik Levkowetz 0baf1899d8 Merged [7734] from rcross@amsl.com: changes to support IAB group types, including requesting a session and uploading materials. 
- Legacy-Id: 7762
Note: SVN reference [7734] has been migrated to Git commit ed53dfdf78
 2014-05-20 20:21:42 +00:00
Robert Sparks c64243ba31 Fixed a crash when requesting sessions for groups that do not have ADs. Applied to production as 2014-05-13-sreq-rg.patch . Commit ready for merge. 
- Legacy-Id: 7740
 2014-05-13 19:23:45 +00:00
Ryan Cross ed53dfdf78 changes to support IAB group types, including requesting a session and uploading materials. Commit ready for merge 
- Legacy-Id: 7734
 2014-05-12 20:54:33 +00:00
Henrik Levkowetz 4c03bc73d8 Merged in [7726] from rcross@amsl.com: 
Fix secauth middleware to grant access to WG Secretary, RG Chair and Area Director.
 - Legacy-Id: 7729
Note: SVN reference [7726] has been migrated to Git commit 90c9e3e256
 2014-05-10 10:28:20 +00:00
Ryan Cross 90c9e3e256 Fix secauth middleware to grant access to WG Secretary, RG Chair and Area Director. Commit ready for merge. 
- Legacy-Id: 7726
 2014-05-08 22:26:50 +00:00
Henrik Levkowetz 93cf098bf7 Merged [7678] from rcross@amsl.com: Show correct group type and ommit link to tools.ietf.org on BOF proceedings. 
- Legacy-Id: 7722
Note: SVN reference [7678] has been migrated to Git commit e838ca78c5
 2014-05-08 19:11:31 +00:00
Henrik Levkowetz 5bb6c50c66 Merged [7677] from rjsparks@nostrum.com: Protect against cases where add_state_change_event can return None. Fixes bug # 1383. 
- Legacy-Id: 7721
Note: SVN reference [7677] has been migrated to Git commit cb458b1689
 2014-05-08 18:58:00 +00:00
Henrik Levkowetz 9c12b28ba2 Changed a bunch of URLs from http:// to https://, and stripped instances of http.?://datatracker.ietf.org/ from some URLs to make them work better in test and development deployments. 
- Legacy-Id: 7683
 2014-05-01 19:43:13 +00:00
Ryan Cross e838ca78c5 Show correct group type and ommit link to tools.ietf.org on BOF proceedings. Commit ready for merge 
- Legacy-Id: 7678
 2014-04-30 23:14:56 +00:00
Robert Sparks cb458b1689 Protect against cases where add_state_change_event can return None. Fixes bug # 1383. Commit ready for merge. 
- Legacy-Id: 7677
 2014-04-30 22:17:01 +00:00
Henrik Levkowetz 3e0e10377c Changed how edit_mtg() is called, in order to propagate kwargs as kwargs. Removed repeated @check_permissions. 
- Legacy-Id: 7664
 2014-04-28 16:34:09 +00:00
Henrik Levkowetz 666d67eec3 Merged [7653] from rcross@amsl.com: fix two issues with proceedings generation. 
- Legacy-Id: 7654
Note: SVN reference [7653] has been migrated to Git commit a886f9ddcd
 2014-04-25 19:19:09 +00:00
Ryan Cross a886f9ddcd fix two issues with proceedings generation. Commit ready for merge. 
- Legacy-Id: 7653
 2014-04-25 18:06:07 +00:00
Henrik Levkowetz 3ac1856d09 Merged in [7644] from rjsparks@nostrum.com: 
From rjsparks@nostrum.com:
  -  Fixed layout issue on schedule editing page in Chrome
  -  Fixed errant display of text in unscheduled group bar
     on the schedule editing page
  -  Changed the instruction text on the special requests
     field of the session request form
From rcross@amsl.com:
  - Improved scheduling of non-session items
  - Fixed issue with layout of the new notifications page
  - Fixed crash on notifications page
 - Legacy-Id: 7651
Note: SVN reference [7644] has been migrated to Git commit b8cfbf18e5
 2014-04-25 15:45:54 +00:00
Robert Sparks b8cfbf18e5 From rjsparks@nostrum.com: 
-  Fixed layout issue on schedule editing page in Chrome
  -  Fixed errant display of text in unscheduled group bar
     on the schedule editing page
  -  Changed the instruction text on the special requests
     field of the session request form

From rcross@amsl.com:
  - Improved scheduling of non-session items
  - Fixed issue with layout of the new notifications page
  - Fixed crash on notifications page
 - Legacy-Id: 7644
 2014-04-25 14:44:40 +00:00
Henrik Levkowetz e11180e073 Changed the get_meeting import in ietf.secr.drafts.views to get it from where it's actually located. 
- Legacy-Id: 7642
 2014-04-25 13:28:48 +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
Ryan Cross 029b477180 resolve several bugs with scheduling code 
- Legacy-Id: 7618
 2014-04-17 17:05:36 +00:00
Henrik Levkowetz 9ce5280229 Applied a patch from rcross@amsl.com, which fixes a problem associated with the recent Secretariat auth changes and the not-so-ideal use of sessions in the sec code. 
- Legacy-Id: 7594
 2014-04-12 18:05:00 +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 7603f4e1da Merged [7568] from rcross@amsl.com: grant ISOC CEO access to announcement tool, change announcement tool from option 'IAB Executive Director' to 'IAB Executive Administrative Manager' 
- Legacy-Id: 7573
Note: SVN reference [7568] has been migrated to Git commit 2cf5f1ce25
 2014-04-06 15:09:55 +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
Ryan Cross 2cf5f1ce25 grant ISOC CEO access to announcement tool, change announcement tool from option 'IAB Executive Director' to 'IAB Executive Administrative Manager' 
- Legacy-Id: 7568
 2014-04-03 17:46:27 +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 2ff7900326 fix various issues with recent changes 
- Legacy-Id: 7559
 2014-04-01 18:09:11 +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
Ryan Cross 0b5fc98290 fix tests to work with secauth middleware changes 
- Legacy-Id: 7549
 2014-03-27 16:08:27 +00:00
Robert Sparks e3d946999c Reworked add/edit of resources and people who must be there on session requests 
- Legacy-Id: 7543
 2014-03-25 22:29:58 +00:00
Robert Sparks 73c4f694ca remove agenda from the meeting creation/edit form - that is managed elsewhere now 
- Legacy-Id: 7528
 2014-03-19 21:00:14 +00:00
Robert Sparks 0d5a940f55 Create no ScheduledSessions with session=None 
- Legacy-Id: 7510
 2014-03-17 18:54:11 +00:00
Robert Sparks ad54cfe230 resolved an ambiguous URL pattern added to secr.sreq.urls and (hopefully) fixed a broken form initializer in code added to secr/sreq/forms 
- Legacy-Id: 7508
 2014-03-16 21:32:13 +00:00
Robert Sparks 59fe8ee3bf Valid name for initial schedule 
- Legacy-Id: 7507
 2014-03-16 19:07:51 +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 865f221225 Finished up making ietf/secrpyflakes-clean. Removed some dead code. 
- Legacy-Id: 7493
 2014-03-15 23:32:21 +00:00
Henrik Levkowetz f9b76bff13 Made ietf/secr/proceedings pyflakes-clean. 
- Legacy-Id: 7492
 2014-03-15 23:31:09 +00:00
Henrik Levkowetz c4c8effcde Made ietf/secr/sreq pyflakes-clean. 
- Legacy-Id: 7491
 2014-03-15 23:30:48 +00:00
Henrik Levkowetz 0b65b383f8 Made ietf/secr/rolodex pyflakes-clean. 
- Legacy-Id: 7490
 2014-03-15 23:30:31 +00:00
Henrik Levkowetz b20382729c Corrected an import bug. 
- Legacy-Id: 7489
 2014-03-15 23:29:45 +00:00
Henrik Levkowetz ef0c4206f5 Made ietf/secr/middleware pyflakes-clean. 
- Legacy-Id: 7488
 2014-03-15 23:27:10 +00:00
Henrik Levkowetz 4dd7b6963f Made ietf/secr/meetings pyflakes-clean and fixed a bug in the signature of is_combined() 
- Legacy-Id: 7487
 2014-03-15 23:25:59 +00:00
Henrik Levkowetz aeaf0413a6 Made ietf/secr/telechat pyflakes-clean. 
- Legacy-Id: 7486
 2014-03-15 23:24:19 +00:00
Henrik Levkowetz 6e9469da01 Made ietf/secr/areas pyflakes-clean. 
- Legacy-Id: 7485
 2014-03-15 23:22:48 +00:00
Henrik Levkowetz 3893061219 Fixed the use of a non-existing model in AddAreaForm. It does however look like this form isn't used anywhere, so I've also commented the code out for now. 
- Legacy-Id: 7484
 2014-03-15 23:22:03 +00:00
Henrik Levkowetz b9d6d0295e Made ietf/secr/ipradmin pyflakes-clean. 
- Legacy-Id: 7483
 2014-03-15 22:10:11 +00:00
Henrik Levkowetz 498777ad24 Made ietf/secr/{drafts,roles,ipradmin} pyflakes-clean. 
- Legacy-Id: 7482
 2014-03-15 22:06:48 +00:00
Henrik Levkowetz 5bbbe24e91 Made ietf/secr/announcement pyflakes-clean. 
- Legacy-Id: 7481
 2014-03-15 21:37:19 +00:00
Henrik Levkowetz 8a6c121073 Made ietf/secr/groups pyflakes-clean. 
- Legacy-Id: 7480
 2014-03-15 21:13:21 +00:00
Henrik Levkowetz b9c38d3c06 Merged pyflakes fixes forward to new copy of trunk. 
- Legacy-Id: 7463
 2014-03-15 16:27:05 +00:00
Henrik Levkowetz 5bef5d11ae Made doc/ pyflakes-clean. 
- Legacy-Id: 7462
 2014-03-15 16:09:47 +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
Ryan Cross 37b758b04e changes to support django authentication 
- Legacy-Id: 7454
 2014-03-13 00:06:16 +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 bb029db147 Merged [7400] from rcross@amsl.com: fix bugs with decorators.check_permissions() to allow upload to top level group and fix plenary check. 
- Legacy-Id: 7408
Note: SVN reference [7400] has been migrated to Git commit 03643cb0344f9a04e0f0041f9c1ace6a82375da2
 2014-03-04 21:44:37 +00:00
Henrik Levkowetz e1efe561da Merged [7397] from rcross@amsl.com: fix bug where build_nonsession() not creating ScheduledSession objects. 
- Legacy-Id: 7406
Note: SVN reference [7397] has been migrated to Git commit 0f0bcd0da3ccf98b5449e6dd1d98a431726986eb
 2014-03-04 21:21:01 +00:00
Henrik Levkowetz dfd9b98de8 Reapplied merge of [7209], which although listed in svn:mergeinfo on . actually doesn't seem to have made it into the repository. 
- Legacy-Id: 7265
Note: SVN reference [7209] has been migrated to Git commit 8d56e458d9
 2014-02-19 14:53:45 +00:00
Henrik Levkowetz 08c0b601c3 Merged [7214] from rcross@amsl.com: change old references to pub.ietf.org, to datatracker.ietf.org/secr/. 
- Legacy-Id: 7242
Note: SVN reference [7214] has been migrated to Git commit b9552a9331
 2014-02-16 16:28:47 +00:00
Henrik Levkowetz 1b3bbad040 Merged [7213] from rcross@amsl.com: add missing template unauthorized.html. 
- Legacy-Id: 7241
Note: SVN reference [7213] has been migrated to Git commit 913d90b90a
 2014-02-16 16:26:35 +00:00
Ryan Cross b9552a9331 change old references to pub.ietf.org, to datatracker.ietf.org/secr/. ready for merge 
- Legacy-Id: 7214
 2014-02-06 21:10:08 +00:00
Ryan Cross 913d90b90a add missing template unauthorized.html. ready for merge 
- Legacy-Id: 7213
 2014-02-06 20:42:44 +00:00
Ryan Cross 8d56e458d9 fix typo in drafts add(). ready for merge 
- Legacy-Id: 7209
 2014-02-05 21:24:59 +00:00
Henrik Levkowetz 78b09b0c4e Merged [7174] from rcross@amsl.com: 
fix build_nonsession for new db schema, and path to roles ajax call
 - Legacy-Id: 7179
Note: SVN reference [7174] has been migrated to Git commit 7e38c4becd
 2014-01-28 21:17:07 +00:00
Henrik Levkowetz a07e2cfbc3 Merged [7151] from rcross@amsl.com: 
Ticket #1248: catch DoesNotExist errors with user.get_profile() when user does not have a corresponding Person record.
 - Legacy-Id: 7178
Note: SVN reference [7151] has been migrated to Git commit d119b33a1a
 2014-01-28 21:15:41 +00:00
Henrik Levkowetz 5dd0aa075d Merged [7073] from rcross@amsl.com: 
changes to official proceedings generation code to support new agenda schema
 - Legacy-Id: 7177
Note: SVN reference [7073] has been migrated to Git commit 35a94362a1
 2014-01-28 21:12:49 +00:00
Ryan Cross 7e38c4becd fix build_nonsession for new db schema, and path to roles ajax call 
- Legacy-Id: 7174
 2014-01-28 14:11:13 +00:00
Henrik Levkowetz 2d420fac34 Merged additional django-port and shim-removal tweaks from olau@iola.dk: branch/iola/djangoport@7167. 
- Legacy-Id: 7168
 2014-01-26 16:30:52 +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
Ryan Cross d119b33a1a Ticket #1248: catch DoesNotExist errors with user.get_profile() when user does not have a corresponding Person record. 
- Legacy-Id: 7151
 2014-01-17 23:04:17 +00:00
Ole Laursen 87ca10d122 Remove usage of log_state_changed (and duplicate in 
doc/utils_charter.py) in favour of add_state_change_event which has
slightly better API but otherwise does basically the same except it
sets an event type we can later search for. Also expand tests slightly
to exercise three more templates.
 - Legacy-Id: 7129
 2014-01-15 17:52:00 +00:00
Ryan Cross 35a94362a1 changes to official proceedings generation code to support new agenda schema 
- Legacy-Id: 7073
 2014-01-04 00:38:44 +00:00
Henrik Levkowetz b68bedce30 Merged in [7009] from rcross@amsl.com: removed references to old models for shim removal release. 
- Legacy-Id: 7020
Note: SVN reference [7009] has been migrated to Git commit cf81cce650
 2013-12-19 17:17:58 +00:00
Ryan Cross cf81cce650 remove references to old models for shim removal release. ready for merge 
- Legacy-Id: 7009
 2013-12-19 04:52:33 +00:00
Ole Laursen 23725f781c Port secr/drafts/report_id_activity.py away from setup_environ too 
- Legacy-Id: 6988
 2013-12-18 16:02:04 +00:00
Ole Laursen e54bd17499 Port from django.core.management.setup_environ to DJANGO_SETTINGS_MODULE 
- Legacy-Id: 6985
 2013-12-18 15:51:11 +00:00
Ole Laursen cf61f2b59b Remove a bunch of unnecessary |escape filter calls, auto-escaping is enabled by default so manual escape is only necessary in few cases 
- Legacy-Id: 6981
 2013-12-18 13:38:13 +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
Ole Laursen ea24f5c3bd Import slugify from django.utils.text (introduced in Django 1.5) 
- Legacy-Id: 6967
 2013-12-18 10:00:58 +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 d1782297ab assertEquals -> assertEqual in tests, the former is deprecated 
- Legacy-Id: 6964
 2013-12-17 12:52:24 +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 36dd439027 Rewrite ifequal/endifequal template tags to if tags with ==/!= 
- Legacy-Id: 6961
 2013-12-17 10:42:34 +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
Ole Laursen 84a9f49053 mimetype -> content_type (mimetype is deprecated) 
- Legacy-Id: 6945
 2013-12-16 16:53:47 +00:00
Ole Laursen d86789608a Remove use of "groupgroup" fixture from Secretariat apps, it looks 
like they don't actually depend on it, and the fixture itself is
unfortunately not complete so Django refuses to load it
 - Legacy-Id: 6938
 2013-12-16 13:16:29 +00:00
Ole Laursen 0c2c5a7573 Rewrite url tags in Secretariat templates to new syntax 
- Legacy-Id: 6936
 2013-12-16 13:05:38 +00:00
Ole Laursen e1025e67ae Fix some oddities in secauth.py 
- Legacy-Id: 6934
 2013-12-16 12:48:43 +00:00
Ole Laursen 2eb8566d2f Remove : after label_tag in templates, the colon is now included in the label_tag itself 
- Legacy-Id: 6930
 2013-12-13 17:34:05 +00:00