Index: smadrill/views.py =================================================================== --- smadrill/views.py (revision 38735) +++ smadrill/views.py (working copy) @@ -74,12 +74,27 @@ def create_morfagame(self, request): count, correct = 0, 0 - - if request.method == 'POST': - data = request.POST.copy() + settings_form = MorfaSettings(request.GET) + + if request.method == 'GET' and len(settings_form.data.keys()) > 0: + post_like_data = request.GET.copy() + if not 'book' in post_like_data: + post_like_data['book'] = 'all' + else: + post_like_data = False + # So can I get GET data to make changes to form, but I can't get + # it to load the game with this data. + # reason is logic is forked into POST/GET, not POST & has game + # data + + if request.method == 'POST' or post_like_data: + if post_like_data: + data = post_like_data + else: + data = request.POST.copy() # Settings form is checked and handled. - settings_form = MorfaSettings(request.POST) + settings_form = MorfaSettings(data) for k in settings_form.data.keys(): self.settings[k] = settings_form.data[k] @@ -112,7 +127,7 @@ # TODO: this doesn't seem to be working. no settings in data, # even when settings are changed. - if "settings" in data: + if "settings" in data or post_like_data: game.new_game() else: game.check_game(data)