Commit graph

44 commits

Author SHA1 Message Date
Robert Sparks 1a5a7b998a Show the ballot question on the position entry form.
- Legacy-Id: 4550
2012-06-28 21:56:51 +00:00
Robert Sparks 51ab8123d9 merged in from 4.20-ise
- Legacy-Id: 4502
2012-06-22 20:25:17 +00:00
Henrik Levkowetz afe3ee71b8 Merged in fixes from Ole, from branch/charter:r4382-4407, and some changes from Henrik (removing the use of pos.blocked in views_ballot.py, and setting a ballot id in idrfc/testsREDESIGN.py) to make idrfc.EditPositionTestCase succeed.
- Legacy-Id: 4444
2012-06-10 16:22:16 +00:00
Ole Laursen bb30e1d681 Remove accidentally committed debug print.
- Legacy-Id: 4406
2012-05-07 19:21:54 +00:00
Henrik Levkowetz c7e75522ad Fix bug in picking up blocking text (patch provided by olau@iola.dk).
- Legacy-Id: 4387
2012-05-04 12:57:06 +00:00
Henrik Levkowetz 839df60480 Merged in charter branch fixes from olau@iola.dk, from r4354 through r4381.
- Legacy-Id: 4382
2012-05-04 11:47:30 +00:00
Ole Laursen b6a057673a Fix wording of send ballot comment, the actual text was still specific
to drafts.
 - Legacy-Id: 4360
2012-05-03 16:15:20 +00:00
Henrik Levkowetz bcd28cc45f Merged in fixes to the migration from olau@iola.dk. Merged in charter branch from olau@iola.dk. Added various fixes and correction of merge errors.
- Legacy-Id: 4353
2012-05-02 19:35:32 +00:00
Ole Laursen 0fc1561260 Close draft ballot on Secretariat approval/disapproval action
- Legacy-Id: 4277
2012-04-16 13:59:16 +00:00
Ole Laursen 1ff4bc0121 Port idrfc code to use new ballot setup with an explicit ballot on
positions, port and clean up ballot icon renderer, add preliminary migration
script for inserting extra events in drafts
 - Legacy-Id: 4274
2012-04-16 13:19:47 +00:00
Ole Laursen 7b2963aaf0 Move note about IANA scraping messages, apparently I managed to put it
in the wrong place (they're of course scraping draft approvals, not
the ballot announcements).
 - Legacy-Id: 4260
2012-04-05 14:45:33 +00:00
Ole Laursen e4a9d8c7aa Finish ballot support for charters (apart from non-generic ballot
deferral), remove a bunch of now obsolete charter code.
 - Legacy-Id: 4255
2012-04-04 18:09:03 +00:00
Ole Laursen 25cb532348 Move last call announcement text to last call event rather than
stuffing it inside the state change event.
 - Legacy-Id: 4253
2012-04-03 16:46:23 +00:00
Ole Laursen a9817e555a Some fixes to generic doc ballot view, fix edit position and send
ballot comment email views, moving them to
/doc/foo-bar/ballot/[id]/position/ and ../emailposition/.
 - Legacy-Id: 4249
2012-04-03 14:53:38 +00:00
Ryan Cross cbc660e7fb Ticket #673 Add ability to clear ballot
- Legacy-Id: 4212
2012-03-24 14:48:24 +00:00
Ole Laursen 3127cd0928 Clear the discuss text if the position isn't discuss as we may get
some unintended text submitted from the browser if the previous
position was discuss. Fixes #788.
 - Legacy-Id: 4035
2012-03-05 19:49:16 +00:00
Ole Laursen 7747e3a836 Only trim ballot discusses/comments on the right side, not the left,
since some ADs are using the left-side for formatting, fixes #782.
 - Legacy-Id: 4022
2012-03-02 13:38:20 +00:00
Ole Laursen f05bc8cf1f Add "Assigned to area" select box to individually submitted documents
in the AD edit form, change search to define area = doc.group or
doc.group.parent (so don't take AD into account), plus a bunch of
small tweaks to make a document with an area set as group behave like
an individually submitted document, at least for the time being (they
are presented as "Individual in xyz area" on their document page)
 - Legacy-Id: 3968
2012-02-25 01:48:33 +00:00
Ole Laursen 793bb146c9 Expand send ballot comment test to check discuss too, fix bug where it
was testing pos directly instead of pos_id
 - Legacy-Id: 3931
2012-02-16 16:42:11 +00:00
Ole Laursen 480cb04cd6 Save announcements generated by the system as Messages, adding an
extra relation to be able to associate a draft with the message
 - Legacy-Id: 3917
2012-02-08 21:05:28 +00:00
Ole Laursen d43159cd90 Add support for incoming ADs with a new "pre-ad" role
- Legacy-Id: 3900
2012-02-03 16:22:31 +00:00
Ole Laursen 980d4e6444 Move new schema models from redesign/ to ietf/
- Legacy-Id: 3855
2012-01-24 17:17:24 +00:00
Ole Laursen fc88964298 Go through the code and replace uses of Person.name with Person.plain_name()
- Legacy-Id: 3849
2012-01-23 20:22:45 +00:00
Ole Laursen 5fa8d71303 Autogenerate approval text if it's not there rather than requiring it
to be generated (noticed by Robert Sparks)
 - Legacy-Id: 3836
2012-01-20 14:21:24 +00:00
Ole Laursen 3ed02196d7 Fix some instances where we use a non-role email for ADs in spite of them acting as ADs
- Legacy-Id: 3741
2011-12-06 14:01:44 +00:00
Ole Laursen af8c1b4bf8 Revamp comment handling on state changes slightly, reenable changing
substate in the IESG state interface (modeled with tags)
 - Legacy-Id: 3725
2011-11-29 18:46:42 +00:00
Ole Laursen 5d291f222c Remove .state and .*_state on Document in favour of generic states
mapping, port the codebase to use these states
 - Legacy-Id: 3660
2011-11-16 18:18:06 +00:00
Ole Laursen 38ee2921c4 Remove some artificial updates of the document timestamp to ensure
that the code follows the protocol for dealing with history objects
properly
 - Legacy-Id: 3304
2011-08-12 09:49:15 +00:00
Ole Laursen af768fb633 Fix a bunch of merge bugs
- Legacy-Id: 3191
2011-06-29 13:05:11 +00:00
Ole Laursen 03bed41630 Merged in changes from the conversion branch
- Legacy-Id: 3187
2011-06-28 18:20:20 +00:00
Robert Sparks 6484874ca2 1) Restructured the position editing page to better integrate the defer button.
Fixes bug #659

2) Copied the jquery-1.5.1.min.js library into /static/js/lib (from /static/js)
    because that's where the main document template was looking for it. There have
    probably been several problems since the change that left this dangling that
    showed up as things not behaving, but not as errors. The one that clued me in
    was the discuss text-box not being hidden when the position wasn't DISCUSS.
    They should all behave better now.

3) Added a django form validator to the discuss text field to not allow actions
   when the position is Discuss, but the discuss-text is empty.
   2 and 3 together fix bug #660 

4) Added logic to the undefer fuction to put the document back on the previous
   telechat (if that hasn't already passed). That is, date1 from telechat dates,
   and not date2.
   Fixes bug #661

5) Changed the last_call_announcement generation function's template to include
   the abstracts from the document sets (which with modern usage means the abstract
   of the document) reflecting the IESGs decision of a few months back.
   Fixes bug #662

6) Removed the old tracker link from the document's main page
   Fixes bug #663 

_M   .
M    ietf/idrfc/views_ballot.py
M    ietf/templates/idrfc/last_call_announcement.txt
M    ietf/templates/idrfc/undefer_ballot.html
M    ietf/templates/idrfc/doc_tab_document.html
M    ietf/templates/idrfc/edit_position.html
_M   ietf/utils/draft.py
_M   static/media
A  + static/js/lib/jquery-1.5.1.min.js
 - Legacy-Id: 3107
2011-05-09 20:16:32 +00:00
Robert Sparks 024a74a562 1) Restructured the position editing page to better integrate the defer button.
2) Copied the jquery-1.5.1.min.js library into /static/js/lib (from /static/js)
   because that's where the main document template was looking for it. There have
   probably been several problems since the change that left this dangling that
   showed up as things not behaving, but not as errors. The one that clued me in
   was the discuss text-box not being hidden when the position wasn't DISCUSS.
   They should all behave better now.

3) Added a django form validator to the discuss text field to not allow actions
   when the position is Discuss, but the discuss-text is empty.

4) Added logic to the undefer fuction to put the document back on the previous
   telechat (if that hasn't already passed). That is, date1 from telechat dates,
   and not date2.

5) Changed the last_call_announcement generation function's template to include
   the abstracts from the document sets (which with modern usage means the abstract
   of the document) reflecting the IESGs decision of a few months back.
 - Legacy-Id: 3097
2011-05-05 13:58:37 +00:00
Henrik Levkowetz 663113d6fa Previous IPR information in last call announcements could be incomplete. Use a better search for IPR declarations related to a document, and include the IPR information in the last call preview.
- Legacy-Id: 3084
2011-05-03 14:12:00 +00:00
Henrik Levkowetz c3f3fdb79a Merged [2944] from rjsparks@nostrum.com:
Add a defer/undefer button to the edit_position dialog
 - Legacy-Id: 2951
Note: SVN reference [2944] has been migrated to Git commit 6b997bca0146b9a93967cd319f617a626304e22e
2011-03-26 14:31:41 +00:00
Henrik Levkowetz dbe590372a Provide a full URL to the last call email, rather than just the local url path.
- Legacy-Id: 2913
2011-03-24 12:37:45 +00:00
Henrik Levkowetz c20d969eaf Merged [2673] from rjsparks@nostrum.com:
Refined the email sent when an position changes.
Added a helper to Position to get the current position description as a string This fixes issue #547.
 - Legacy-Id: 2674
Note: SVN reference [2673] has been migrated to Git commit 770429b398a9480a5367066d43d9c503d8fdae4a
2010-11-10 09:21:09 +00:00
Henrik Levkowetz 2e07520667 Merged [2618] from lars.eggert@nokia.com:
Fix for #525. Adds more information to the document history tab, specifically changes to writeup, announcement and last-call text.
 - Legacy-Id: 2633
Note: SVN reference [2618] has been migrated to Git commit d7a942c2fbd08a9922fde0d848d25037d35d56c5
2010-11-06 09:32:05 +00:00
Henrik Levkowetz acb5879ba1 Merged [2615] from rjsparks@nostrum.com:
Changed the language used in the last call email to be closer to the language the tracker uses when no IPR declarations are found directly on the draft. Fixes #506
 - Legacy-Id: 2631
Note: SVN reference [2615] has been migrated to Git commit cd14ad91ae9d2462b49e4f8887db7efe68cb50ea
2010-11-06 09:23:37 +00:00
Henrik Levkowetz db9f5886d7 Merged [2607] from lars.eggert@nokia.com: This commit fixes tickets #526 and #530. Specifically, it changes the format of the notification email sent out when an AD posts a ballot position on a draft, it by default CCs that email to the authors and chairs, and adds some explanatory text to the body of those messages.
- Legacy-Id: 2624
Note: SVN reference [2607] has been migrated to Git commit e1134da629dbe5a9b85cad5608e50e03fbbae797
2010-11-06 08:46:30 +00:00
Henrik Levkowetz eafcdccd3d Merged from log:branch/iesg-tracker@2571: IOLA's port of cron-scripts.
- Legacy-Id: 2578
2010-10-26 14:49:12 +00:00
Henrik Levkowetz 51ab79364c Merged [2496] from rjsparks@nostrum.com: Changed the navigation round editing ballots and sending discuss/email so that the user comes back to the page the edit started from.
- Legacy-Id: 2519
Note: SVN reference [2496] has been migrated to Git commit eccf544ee4f12b00ed3030115f487720ae330fee
2010-09-16 10:23:53 +00:00
Henrik Levkowetz 28e0f982c5 Merged [2412], [2413] and [2480] from rjsparks@nostrum.com, from log:sprint/78/rjs@2480. Splits the ballot writeups page into three pages, for a more understandable user interface.
- Legacy-Id: 2517
Note: SVN reference [2412] has been migrated to Git commit f87a9376b985814435b1e9b8bb5d73a45fd7292d

Note: SVN reference [2413] has been migrated to Git commit 6835826cb3d5ad1e1558b828bd9d349d5feffa98

Note: SVN reference [2480] has been migrated to Git commit ec80763835dbaad0c68c3bdaee41fdeb92876897
2010-09-16 10:04:48 +00:00
Henrik Levkowetz 0818e58ddf Merged [2490] from olau@. Fixes issue #364.
- Legacy-Id: 2493
Note: SVN reference [2490] has been migrated to Git commit 860041df216ae6b11e059e37c96b64eae45de0ff
2010-08-19 15:31:24 +00:00
Henrik Levkowetz 266b7820d0 Merged from log:branch/2.00@2363: Current release branch head to trunk.
- Legacy-Id: 2365
2010-07-21 12:48:05 +00:00