Commit graph

3381 commits

Author SHA1 Message Date
Henrik Levkowetz bb148003b5 Fixed the plenary display code for the text agenda to use the non-proxy plenary information to identify the plenaries, matching other previous changes from the agenda branch.
- Legacy-Id: 6383
2013-10-08 06:42:53 +00:00
Henrik Levkowetz dbc17624f8 Added a break_info() model on Timeslot. Fixes the missing breaks on the
text agenda.
 - Legacy-Id: 6376
2013-10-04 21:49:52 +00:00
Henrik Levkowetz f95b2795fe Putting a place a known-good text version of the agenda for meeting 83. This
is the way it should look.  If something else is produced, it's not right.
The order of sessions on this agenda is sorted first on area on then on
acronym.  This is the known good agenda.
 - Legacy-Id: 6375
2013-10-04 21:18:47 +00:00
Henrik Levkowetz 8561e9c2d8 Removed unwanted Http403 exception.
- Legacy-Id: 6374
2013-10-04 20:46:08 +00:00
Henrik Levkowetz 799c8c8f69 Fixed the agenda-utc test to be insensitive to the release number.
- Legacy-Id: 6373
2013-10-04 20:43:46 +00:00
Henrik Levkowetz da1cf81bf7 Fixed the return value assigment from agenda_info() in cvs_agenda()
- Legacy-Id: 6372
2013-10-04 20:41:02 +00:00
Henrik Levkowetz e2134a67a2 Rename agendaREDESIGN.ics -> agenda.ics. The old agenda.ics file isn't in use
any more.
 - Legacy-Id: 6370
2013-10-04 18:47:20 +00:00
Henrik Levkowetz 83cab39be7 Added a RoomAdmin to the admin site.
- Legacy-Id: 6369
2013-10-04 18:08:09 +00:00
Henrik Levkowetz 03a79d4736 Merged [6363] from mcr@sandelman.ca: Don't include timeslots marked
'unavailable' in the agenda.
 - Legacy-Id: 6365
Note: SVN reference [6363] has been migrated to Git commit 8de0d8a0c8814059b153e96929220bed6cb46e2c
2013-10-04 14:07:13 +00:00
Henrik Levkowetz e87ba2d869 Added ordering ('-date') to the Meeting model
- Legacy-Id: 6364
2013-10-04 14:03:12 +00:00
Henrik Levkowetz 3020c5f7eb Imported a new version of the draft metadata extraction module, which
calculates page numbers more reliably, doesn't include duplicates in
the list of referenced drafts, and other minor tweaks.
 - Legacy-Id: 6362
2013-10-04 13:50:14 +00:00
Henrik Levkowetz 6c13e8027b Fixed the language in some UI strings in the nomcom tool.
- Legacy-Id: 6358
2013-10-03 20:56:59 +00:00
Henrik Levkowetz ed891d23d0 Set version info and settings back to development mode
- Legacy-Id: 6355
2013-10-03 14:22:46 +00:00
Henrik Levkowetz d256693205 Set version info to release version 4.80 before branching.
- Legacy-Id: 6353
2013-10-03 14:22:42 +00:00
Henrik Levkowetz 212ff26fad Reverted a mistake in agenda.html.
- Legacy-Id: 6351
2013-10-03 14:22:29 +00:00
Henrik Levkowetz 807ea25e3c Removed some debug statements.
- Legacy-Id: 6350
2013-10-03 14:20:14 +00:00
Henrik Levkowetz c78be852a5 Added a new WG (ietf stream) tag slug.
- Legacy-Id: 6349
2013-10-03 11:48:56 +00:00
Henrik Levkowetz cc8817846a Applied the same patch to other templates which use the same approach. Fixed 2 typos.
- Legacy-Id: 6347
2013-10-03 05:40:41 +00:00
Henrik Levkowetz ca81ed0840 Moved script loading inside {% block scripts %}. Patch from rjsparks@nostrum.com.
- Legacy-Id: 6346
2013-10-03 05:11:43 +00:00
Henrik Levkowetz a3c8adfdf6 Merged in the contents of commit [6337] from mcr@sandelman.ca, with some changes to take out dead code that inadvertently came back in.
- Legacy-Id: 6344
Note: SVN reference [6337] has been migrated to Git commit d0d1d949a9328da6c4e30d8f5e0d14ffb204e678
2013-10-02 21:53:28 +00:00
Henrik Levkowetz 08e90fd63f Enabling jquery again in template base.html. Moving library pack jquery-1.8.2 from /static/js/ to /static/js/lib/. Replacing jquery-1.5.1 with 1.8.2 in some places; the incompatibilities listed on the jquery pages seem to be small, and on a cursory inspection not present in the current usage.
- Legacy-Id: 6342
2013-10-02 15:44:50 +00:00
Henrik Levkowetz fada6fdfc9 Provide the site_base_url to the template without a trailing slash, for easier use in javascript.
- Legacy-Id: 6339
2013-10-02 14:11:30 +00:00
Henrik Levkowetz 342bc5bf96 Merged in the merge work branch personal/henrik/r6270 which provides the agenda scheduling tool step 3, from a merge of branch/ssw/agenda/v4.70 from mcr@sandelman.ca; and also substantial fixes to the test framework, and more.
- Legacy-Id: 6328
2013-10-01 13:53:05 +00:00
Henrik Levkowetz d2df8cac78 Fixed the manyfold duplicated position names in the position selection drop-down list in the nomcom private index page. Fixes issue #1137.
- Legacy-Id: 6327
2013-10-01 13:42:30 +00:00
Henrik Levkowetz 983785d63c Fixed a typo.
- Legacy-Id: 6326
2013-09-30 21:00:12 +00:00
Henrik Levkowetz 87898cb006 Updated the text agenda comparison copy to match the ADs present in the fixtures.
- Legacy-Id: 6325
2013-09-30 20:50:32 +00:00
Henrik Levkowetz 3d158d1891 Renamed person.json fixture to persons.json
- Legacy-Id: 6324
2013-09-30 20:49:11 +00:00
Henrik Levkowetz c6739bbb4f Modified testurl.list for meetings; there were some URLs that could not succeed with the current database content (the URL tests are running against database content taken from the production database, so this is not a case of missing fixtures).
- Legacy-Id: 6322
2013-09-30 20:40:02 +00:00
Henrik Levkowetz 18445123aa Made the setting for use of InnoDB for testing default. Added a setting for global test fixtures. Added ietf.utils to the app list to capture the makefixture management command.
- Legacy-Id: 6321
2013-09-30 20:38:06 +00:00
Henrik Levkowetz e4f4467725 Changed tests to use our own subclassed TestCase, and changed almost all fixtures to be perma_fixtures.
- Legacy-Id: 6320
2013-09-30 20:36:20 +00:00
Henrik Levkowetz 4395949b85 Fixed up to use perma_fixtures instead of fixtures. Changed diff of html-agenda so it disregards the changing datatracker version information embedded in the html file. Changed dumping of agenda page results to file to not use a code constant, but instead happen if the test fails. Added an announcement of this to the test exception string.
- Legacy-Id: 6319
2013-09-30 20:29:11 +00:00
Henrik Levkowetz a07f47a4a0 Added a new TestCase class, subclassing django.test.TestCase, in order to
be able to add fixtures once and for all for all tests, instead of loading
them again and again for each test, if running on a database that supports
transaction rollbacks.  In this case, fixtures specified in the perma_fixtures
class attribute will be loaded permanently, and not re-loaded.  Fixtures
specifice as before, in a fixtures class attribute, will be treated as
before.

The downside of this is that as fixtures are loaded and not unloaded, they
can conflict with each other.  The requirements on consistency becomes much
greater.  The effect of this has been to require quite a bit of changes to
the simplified creations of various objects in make_test_data() in cases
where identically named objects occur in fixtures.  Where completely
fictitious objects are created, no conflicts appear.

Also re-wrote parts of test_runner.py to permit global fixtures, loaded
before any tests are run and shared by all.
 - Legacy-Id: 6318
2013-09-30 20:22:24 +00:00
Henrik Levkowetz 4805b4b12e Updated fixtures, built to be more internally consistent in order to be able to pre-load them for the test suite.
- Legacy-Id: 6317
2013-09-30 19:02:53 +00:00
Henrik Levkowetz b335ef3b5c Imported a newer version of makefixture from github. It handles reverse relationships in a less hackish way than my hack.
- Legacy-Id: 6314
2013-09-30 14:24:14 +00:00
Henrik Levkowetz 4b568f8d22 Empty models.py, needed to make django look for management/commands/.
- Legacy-Id: 6310
2013-09-29 21:15:06 +00:00
Henrik Levkowetz 083f60dd93 Renamed model .url() methods to .json_url() or .base_url(), depending on function. Replaced the use of custom django method request.get_host_protocol() with standard request.build_absolute_uri(). Removed an uncaught Http403 exception. Fixed a typo /venus_addr/venue_addr/. Removed relurl() methods; no longer needed. Removed some debug functions.
- Legacy-Id: 6309
2013-09-29 21:14:07 +00:00
Henrik Levkowetz 127deda3c7 The supposedly known-good agenda-utc.html file was filled with '****** SOMETHING WENT WRONG ******', which is clearly wrong. This one is a bit better.
- Legacy-Id: 6308
2013-09-29 20:57:46 +00:00
Henrik Levkowetz 6e9e1930e2 Added a makefixture management command, from http://djangosnippets.org/snippets/918/, somewhat hacked.
- Legacy-Id: 6307
2013-09-29 20:50:51 +00:00
Henrik Levkowetz 92b9da1d4f Moved read_agenda_file() and session_draft_list() back to views.py. The move almost masked a code change in trunk during the merge.
- Legacy-Id: 6294
2013-09-28 05:42:49 +00:00
Henrik Levkowetz 26688aa2ec Changed back to standard TestCase to ensure confidence in tests. Removed duplicate tests. Adapted tests to new json_url() method signature. Corrected the /people/ urls to /person/.
- Legacy-Id: 6293
2013-09-28 05:35:17 +00:00
Henrik Levkowetz 72a19e2ab2 Fixed the on-and-off failing test_agenda83txt(), which gave inconsistent results because the datetime object given to the template to render had no timezone setting. Added a PRODUCTION_TIMEZONE setting, and used it to provide a consistent timezone to the agenda.txt template.
- Legacy-Id: 6292
2013-09-27 20:07:42 +00:00
Henrik Levkowetz 254d6f70dd Removed some debug statements.
- Legacy-Id: 6290
2013-09-27 17:32:35 +00:00
Henrik Levkowetz 8e750a9b18 Revert changes to manage.py -- the intention with these changes was already taken care of with similar code further down.
- Legacy-Id: 6285
2013-09-26 21:55:14 +00:00
Henrik Levkowetz 7bb999e09e Undid gratuitous changes.
- Legacy-Id: 6284
2013-09-26 21:35:18 +00:00
Henrik Levkowetz 7876340a44 Undid gratuitous whitespace changes.
- Legacy-Id: 6283
2013-09-26 21:27:21 +00:00
Henrik Levkowetz ea9d075801 Undid gratuitous whitespace changes.
- Legacy-Id: 6282
2013-09-26 21:26:56 +00:00
Henrik Levkowetz 2f1edc3d68 Undid gratuitous whitespace changes.
- Legacy-Id: 6281
2013-09-26 21:20:41 +00:00
Henrik Levkowetz 321744b0b9 Undid gratuitous whitespace and quoting changes. This code is taken verbatim from an external source, as indicated at the beginning of the file, and should not be messed with unless we fix bugs.
- Legacy-Id: 6280
2013-09-26 21:10:41 +00:00
Henrik Levkowetz 2f890235de Undid gratuitous whitespace changes.
- Legacy-Id: 6279
2013-09-26 21:04:57 +00:00
Henrik Levkowetz be3cff19d1 Moved a migration from the merge forward to have the proper number for application.
- Legacy-Id: 6274
2013-09-26 19:57:36 +00:00
Henrik Levkowetz 6154b9922d This commit isn't tested. It captures the state after merging in branch/ssw/agenda/v4.70.
- Legacy-Id: 6273
2013-09-26 19:56:17 +00:00
Henrik Levkowetz 29eaaa9eda Tweaked the introductory text on the Desired Expertise page.
- Legacy-Id: 6265
2013-09-26 06:32:28 +00:00
Henrik Levkowetz 1dae75ee59 The exception string for submission upload read errors seems to have changed after we switched to wsgi, from "Client read error" to "request data read error". Now looking for just "read error".
- Legacy-Id: 6264
2013-09-26 06:29:28 +00:00
Henrik Levkowetz 0fcaefe29b Added an explanatory paragraph to the Desired Expertise page.
- Legacy-Id: 6263
2013-09-25 13:51:18 +00:00
Henrik Levkowetz 08ea8c1b30 Fixed a wrong secretariat template extension name.
- Legacy-Id: 6260
2013-09-24 17:51:50 +00:00
Henrik Levkowetz 8d9c1e9177 Changed 'requirement' to 'desired expertise' in user-visible places in the nomcom app.
- Legacy-Id: 6259
2013-09-24 17:50:02 +00:00
Henrik Levkowetz 85e7af3370 Added a development helper page.
- Legacy-Id: 6251
2013-09-23 19:27:38 +00:00
Henrik Levkowetz 5d9e6c0b6a Fixed the language of the nomination confirmation message.
- Legacy-Id: 6250
2013-09-23 19:27:17 +00:00
Henrik Levkowetz 86cf15cd9f Fixed some bugs in the EncryptedTextField class.
- Legacy-Id: 6246
2013-09-22 19:26:48 +00:00
Henrik Levkowetz 0016c69b61 Added an index page for nomcoms, at /nomcom/, with links to nomcom pages and announcements, where they exist.
- Legacy-Id: 6245
2013-09-22 18:59:24 +00:00
Henrik Levkowetz c52efcae8c Set version info and settings back to development mode
- Legacy-Id: 6210
2013-09-19 19:31:46 +00:00
Henrik Levkowetz faf1917062 Set version info to release version 4.72 before branching.
- Legacy-Id: 6208
2013-09-19 19:31:44 +00:00
Henrik Levkowetz 32325fc762 Replaced the two AD document links with one pointing to the new view (under the old URL).
- Legacy-Id: 6206
2013-09-19 19:09:39 +00:00
Henrik Levkowetz 44a8eb207b Removed the old ad documents page, and it's view function, and put in a redirect from the temporary /ad2/ url to the /ad/ url.
- Legacy-Id: 6204
2013-09-19 18:24:23 +00:00
Henrik Levkowetz 23cdddf696 Added overview pages for non-ietf-stream documents (ise, iab, irtf).
- Legacy-Id: 6202
2013-09-19 18:21:16 +00:00
Henrik Levkowetz e09667122a Added the ability to search for documents from a certain stream to the main document search form.
- Legacy-Id: 6201
2013-09-19 18:16:10 +00:00
Henrik Levkowetz 6460a7eef2 Updated the comment with the working Apache setting for a dev server.
- Legacy-Id: 6170
2013-09-18 20:31:57 +00:00
Henrik Levkowetz 80a19d6dfd Change the development url patterns to match the name change of static/secr to static/secretariat.
- Legacy-Id: 6169
2013-09-18 20:30:56 +00:00
Henrik Levkowetz d8074d39d3 Merged the latest secretariat code from rcross@amsl.com, from branch/amsl/trunkmerge@6149.
- Legacy-Id: 6168
2013-09-18 19:33:36 +00:00
Henrik Levkowetz da4177e1cd Rename the nomcom public keys path setting.
- Legacy-Id: 6166
2013-09-18 18:10:27 +00:00
Henrik Levkowetz 78a0fd7759 Added a dev-specific robots.txt, which blocks all robots.
- Legacy-Id: 6164
2013-09-18 17:44:51 +00:00
Henrik Levkowetz 68cea34e64 Fixed a typo in the WSGI connector.
- Legacy-Id: 6163
2013-09-18 17:43:38 +00:00
Henrik Levkowetz 11c1b0738a Cleaned up the ipr count code in doc/views_search.py a bit more.
- Legacy-Id: 6162
2013-09-18 17:43:09 +00:00
Henrik Levkowetz 641bcccfba Replaced the ad_hoc nomcom_member_required() decorator with our generic role_required() decorator. Changed access permission for nomcom-chair only pages to also permit nomcom advisor access (this lets the previous nomcom chair explain and assist as needed). Also tweaked some text strings in the email feedback pipe script.
- Legacy-Id: 6160
2013-09-16 21:05:25 +00:00
Henrik Levkowetz d60210484f Moved the nomcom private key storage out of the source tree, which is a silly place to put it.
- Legacy-Id: 6159
2013-09-16 21:00:07 +00:00
Henrik Levkowetz 11e56aa5b2 Modified the code which accumulates ipr disclosures associated with a document, shown as an IPR count in search results. The previous code had two deficiencies: it could count some IPR disclosures twice, and it also included withdrawn and pending disclosures. The current count matches the IPR search results better.
- Legacy-Id: 6158
2013-09-16 20:55:24 +00:00
Henrik Levkowetz dbda8e8c53 A WSGI connector for the datatracker, to let us run under mod_wsgi.
- Legacy-Id: 6157
2013-09-16 20:52:37 +00:00
Henrik Levkowetz 5033aba13e Cleaned upthe manage.py command changes a little bit.
- Legacy-Id: 6156
2013-09-16 20:51:00 +00:00
Henrik Levkowetz 4538ef7b0e Added Nomcom role suport to role_required() through has_role(). This will let us get rid of the more specialized ad_hoc nomcom_memeber_required() which can't handle access for multiple roles.
- Legacy-Id: 6155
2013-09-16 19:18:22 +00:00
Henrik Levkowetz 71f85f96c7 Merged in a fix from rjsparks@nostrum.com for incorrect IANA notification email addresses.
- Legacy-Id: 6152
2013-09-13 22:23:55 +00:00
Ryan Cross 4f98ac157c Revert to pre-agenda tool db schema. Change sec static files subdirectory to 'secretariat'. Branch ready for merge.
- Legacy-Id: 6148
2013-09-12 16:58:44 +00:00
Ryan Cross 54ca99c1bf new version
- Legacy-Id: 6144
2013-09-11 22:08:12 +00:00
Ryan Cross ed745b457d fix bug where concluded BOFs showing in proceedings
- Legacy-Id: 6143
2013-09-11 17:35:10 +00:00
Henrik Levkowetz a4fc386e2e Tweaked the template used to generate the various 1wg-charter*.txt files to properly fetch email addresses. Commit ready for merge.
- Legacy-Id: 6141
2013-09-11 12:51:33 +00:00
Ryan Cross 0d1c0b2db9 updates to announcements and groups view to match secretariat production branch
- Legacy-Id: 6140
2013-09-10 23:49:13 +00:00
Henrik Levkowetz 19b7bc1d60 Fixed an issue when trying to edit a document state when there's no prior state, and removed the link to edit the document state when there's no set state.
- Legacy-Id: 6132
2013-09-10 15:46:46 +00:00
Henrik Levkowetz a132e6720a Fixed 2 issues with the wg document list: Wrong heading for the related docs, and candidate wg docs listed as wg docs, rather than related docs.
- Legacy-Id: 6130
2013-09-10 15:43:17 +00:00
Ryan Cross 62f83fc67d changes to support datatracker v4.71
- Legacy-Id: 6129
2013-09-09 22:26:14 +00:00
Henrik Levkowetz a14808255b Migration for new ConstraintName field: penalty
- Legacy-Id: 6127
2013-09-09 20:55:59 +00:00
Henrik Levkowetz db7106a70c Fixed legacy document fieldname.
- Legacy-Id: 6126
2013-09-09 20:54:56 +00:00
Henrik Levkowetz 78a76c8b07 Set version info and settings back to development mode
- Legacy-Id: 6124
2013-09-09 19:41:37 +00:00
Henrik Levkowetz fa33dbbc87 Set version info to release version 4.71 before branching.
- Legacy-Id: 6122
2013-09-09 19:41:03 +00:00
Henrik Levkowetz 9dc13aa8f2 Merged in personal/rjs/r6117-pubreq:
- Made Publication Request (for documents from IETF working groups) an
  explicit action rather than a side-effect.

- Simplified the working group state edit form.

- Added hints to the WG state edit form to use the document's main page to
  request publication.

- If a document is moved into IESG processing directly by the secretariat or
  an AD (old processing path), set working group state accordingly.
 - Legacy-Id: 6120
2013-09-09 19:29:56 +00:00
Robert Sparks 63139ab860 Made Publication Request (for documents from IETF working groups) an explicit action rather than a side-effect.
Simplified the working group state edit form.
Added hints to the WG state edit form to use the document's main page to request publication.
If a document is moved into IESG processing directly by the secretariat or an AD (old processing path), set working group state accordingly.
 - Legacy-Id: 6119
2013-09-09 18:25:44 +00:00
Henrik Levkowetz 2a2389d17f Merged in branch/iola/shimfree@6083. This cleans up and moves relevant code from idrfc/ to doc/. There should now only be a bit of old wrapper code left in idrfc; that will go away when the remaining models which use it are cleaned up.
- Legacy-Id: 6117
2013-09-09 17:45:36 +00:00
Henrik Levkowetz c93e5cc914 Fixed the manage command so it adds our own import path to the Python path automatically.
- Legacy-Id: 6112
2013-09-09 15:31:10 +00:00
Henrik Levkowetz 0a45268915 Applied patch from rjsparks@nostrum.com to fix a line colouring bug in IPR lists.
- Legacy-Id: 6090
2013-09-06 19:19:47 +00:00
Henrik Levkowetz 808343d06b Fixed regression: wrong URL to IESG state diagram in state help. Fixes issue #1119.
- Legacy-Id: 6088
2013-09-04 14:21:48 +00:00
Henrik Levkowetz 38b0a59ba3 Merged personal/rjs/v4.70@6042:
* Made reporting IPR consistant across document searches, IPR searches, AD document queues, last calls, and agendas. All these points now report on the document(s) being directly queried, and the documents those transitively replace or obsolete.

  * Brought search results against WGs and document titles into consistency with results from searching for individual documents

  * Added the IPR count to the link on the documents main page (when not zero)

  * Built on Henrik's reimplementation of all_related_*, making the *_related_* functions return DocAlias? lists consistently, and added corresponding _relations_ functions to get lists of actual RelatedDocument? objects.

  * Added getting the DocAlias? with the same name to Document

  * Added getting related IPR disclosures (as described in the first bullet) to Document

  * Simplified ipr/related.py

  * Removed the use of DraftLikeDocAlias? and IETFWG from ipr/search.py. Retooled the various search functions and templates to use DocAlias? and IprDocAlias? directly.

  * Removed dead code from ipr/search.py

  * Removed the special handling of WG 2000 from ipr/search.py 

  This fixes bug #1071
 - Legacy-Id: 6083
2013-09-02 18:34:54 +00:00
Henrik Levkowetz d6471397ef Fixed bug in previous commit, for case where iesg_state is None.
- Legacy-Id: 6082
2013-08-30 12:32:11 +00:00