Merge lp:~acoconut/systers/flexible_essays into lp:systers
Status: | Superseded |
---|---|
Proposed branch: | lp:~acoconut/systers/flexible_essays |
Merge into: | lp:systers |
Diff against target: |
293 lines (+130/-38) 5 files modified
Mailman/Cgi/admindb.py (+10/-7) Mailman/Cgi/listinfo.py (+20/-7) Mailman/Cgi/subscribe.py (+46/-7) Mailman/DlistUtils.py (+53/-11) bin/rmlist (+1/-6) |
To merge this branch: | bzr merge lp:~acoconut/systers/flexible_essays |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robin J | Needs Fixing | ||
beachbrake | Pending | ||
Review via email: mp+118537@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-08-09.
Description of the change
Made the changes suggested by Robin: concerning error messages and asserting the size of the answers.
Added the code to mark answers as accepted in the database when a user is accepted.
Unmerged revisions
- 99. By Ana Cutillas <email address hidden>
-
Added support for setting answers to rejected in the database.
- 98. By Ana Cutillas <email address hidden>
-
Changed the logic in the checking of answers in subscribe.py
Cleaned up DlistUtils.py - 97. By Ana Cutillas <email address hidden>
-
Made the changes suggested by Robin: concerning error messages and
asserting the size of the answers.Added the code to mark answers as accepted in the database when a user
is accepted. - 96. By Ana Cutillas <email address hidden>
-
Added the error message saying that the user hasn't been subscribe to
the list when a user tries to subscribe with a pending subscription. - 95. By Ana Cutillas <email address hidden>
-
Added the functionality to check that the answers aren't longer than
what the database can hold. - 94. By Ana Cutillas <email address hidden>
-
Added changes to show the new essays in the pending subscriptions table.
Handle the possibility of a user trying to subscribe twice before the
subscription is reviewed. - 93. By Ana Cutillas <email address hidden>
-
Removed the unused function get_answer from DlistUtils.py
- 92. By Ana Cutillas <email address hidden>
-
Cleaned up DlistUtils and changed the error message in subscribe. Added
comments. - 91. By Ana Cutillas <email address hidden>
-
Cleaned up.
- 90. By Ana Cutillas <email address hidden>
-
Cleaned up listinfo.py
for this line
if (question[2] != 'checkbox'):
This implies that you want to do this for every kind of widget except checkboxes. No, you are doing it for every kind of widget you currently have except checkboxes. Make it clearer for the next person and have it say
if (question[2] == 'small text' or question[2] == 'large text'):
you also want to rethink your structure a bit more -- you have two tests for not being a checkbox, and you should be able to combine them into 1. (again, my guess is that if we add new widgets that are not texty, you may want to treat them differently, so explicitly list the question types you are using.
If these lines aren't useful to you, delete them; it's no longer accurate since you changed the utf-8 find(Subscriber ,Subscriber. mailman_ key == unicode( key,'utf- 8')).set( deleted = False)"
syslog( 'info', 'DlistUtils( subscribeToList ):Executing query:\n%s', command)
command = "self.store.
if DEBUG_MODE:
You defined acceptAnswer, but earlier you have almost identical code, why? Why not call acceptAnswer there?
And why aren't these identical? why do you have 'utf-8' )
unicode_key = unicode(key, "utf-8")
in one place and
userID = addr.decode(
in the other