EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing the incorrect passing of a Goodreads shelf name -- and also incorrect display of number of books on wishlist.

pull/1/head
Raymond Yee 2011-11-15 12:51:38 -08:00
parent 96d264c8a1
commit daef075f5b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/forms.py
View File

@ -47,6 +47,6 @@ class CampaignPledgeForm(forms.Form):
anonymous = forms.BooleanField(required=False, label="Don't display my username in the supporters list") anonymous = forms.BooleanField(required=False, label="Don't display my username in the supporters list")
class GoodreadsShelfLoadingForm(forms.Form): class GoodreadsShelfLoadingForm(forms.Form):
goodreads_shelf_name = forms.CharField(widget=forms.Select(choices=( goodreads_shelf_name_number = forms.CharField(widget=forms.Select(choices=(
('all','all'), ('all','all'),
))) )))

2
frontend/templates/goodreads_display.html
View File

@ -91,7 +91,7 @@
<hr /> <hr />
<p><a href="#" id="test_click">Click here to update the number of books on your wishlist:</a></p> <p><a href="#" id="test_click">Click here to update the number of books on your wishlist:</a></p>
<div id="gr_status"><p>Number of books on your wishlist: <span id="number_of_books_on_wishlist">{{user.wishlist.books.all|length}}</span> (as of <span id="num_books_update_time"></span>)</p></div> <div id="gr_status"><p>Number of books on your wishlist: <span id="number_of_books_on_wishlist">{{user.wishlist.works.all|length}}</span> (as of <span id="num_books_update_time"></span>)</p></div>
<form id="clear_wishlist_form" method="post" action="#"> <form id="clear_wishlist_form" method="post" action="#">
<input type="submit" value="Empty your wishlist" /> <input type="submit" value="Empty your wishlist" />
</form> </form>

8
frontend/views.py
View File

@ -337,7 +337,7 @@ class GoodreadsDisplayView(TemplateView):
# load the shelves into the form # load the shelves into the form
choices = [('all:%d' % (gr_shelves["total_book_count"]),'all (%d)' % (gr_shelves["total_book_count"]))] + \ choices = [('all:%d' % (gr_shelves["total_book_count"]),'all (%d)' % (gr_shelves["total_book_count"]))] + \
[("%s:%d" % (s["name"], s["book_count"]) ,"%s (%d)" % (s["name"],s["book_count"])) for s in gr_shelves["user_shelves"]] [("%s:%d" % (s["name"], s["book_count"]) ,"%s (%d)" % (s["name"],s["book_count"])) for s in gr_shelves["user_shelves"]]
gr_shelf_load_form.fields['goodreads_shelf_name'].widget = Select(choices=tuple(choices)) gr_shelf_load_form.fields['goodreads_shelf_name_number'].widget = Select(choices=tuple(choices))
context["gr_shelf_load_form"] = gr_shelf_load_form context["gr_shelf_load_form"] = gr_shelf_load_form
@ -402,16 +402,16 @@ def goodreads_load_shelf(request):
a view to allow user load goodreads shelf into her wishlist a view to allow user load goodreads shelf into her wishlist
""" """
# Should be moved to the API # Should be moved to the API
goodreads_shelf_name = request.POST.get('goodreads_shelf_name', 'all:0') goodreads_shelf_name_number = request.POST.get('goodreads_shelf_name_number', 'all:0')
user = request.user user = request.user
try: try:
# parse out shelf name and expected number of books # parse out shelf name and expected number of books
(shelf_name, expected_number_of_books) = re.match(r'^(.*):(\d+)$', goodreads_shelf_name).groups() (shelf_name, expected_number_of_books) = re.match(r'^(.*):(\d+)$', goodreads_shelf_name_number).groups()
expected_number_of_books = int(expected_number_of_books) expected_number_of_books = int(expected_number_of_books)
logger.info('Adding task to load shelf %s to user %s with %d books', shelf_name, user, expected_number_of_books) logger.info('Adding task to load shelf %s to user %s with %d books', shelf_name, user, expected_number_of_books)
load_task_name = "load_goodreads_shelf_into_wishlist" load_task_name = "load_goodreads_shelf_into_wishlist"
load_task = getattr(tasks, load_task_name) load_task = getattr(tasks, load_task_name)
task_id = load_task.delay(user, goodreads_shelf_name, expected_number_of_books=expected_number_of_books) task_id = load_task.delay(user, shelf_name, expected_number_of_books=expected_number_of_books)
ct = models.CeleryTask() ct = models.CeleryTask()
ct.task_id = task_id ct.task_id = task_id