Merge pull request #228 from domino14/bug/xxx/word_lists

Bug/xxx/word lists

djAerolith/current_version.py

@@ -1 +1 @@
-CURRENT_VERSION = '0.10.0.2'
+CURRENT_VERSION = '0.10.0.3'

djAerolith/wordwalls/api.py

@@ -214,6 +214,8 @@ def load_aerolith_list(request, parsed_req_body):
         named_list = NamedList.objects.get(pk=parsed_req_body['selectedList'])
     except NamedList.DoesNotExist:
         return bad_request('List does not exist.')
+    except (TypeError, ValueError):
+        return bad_request('Please select a list.')
     tablenum = WordwallsGame().initialize_by_named_list(
         parsed_req_body['lexicon'], request.user, named_list,
         parsed_req_body['quiz_time_secs'],
@@ -255,7 +257,7 @@ def default_lists(request):
         return bad_request('Bad lexicon.')
 
     ret_data = []
-    for nl in NamedList.objects.filter(lexicon=lex):
+    for nl in NamedList.objects.filter(lexicon=lex).order_by('id'):
         ret_data.append({
             'name': nl.name,
             'lexicon': nl.lexicon.lexiconName,

djAerolith/wordwalls/static/js/wordwalls/newtable/table_creator.jsx

@@ -404,7 +404,10 @@ class TableCreator extends React.Component {
       },
       method: 'GET',
     })
-    .done(data => this.setState({ aerolithLists: data }))
+    .done(data => this.setState({
+      aerolithLists: data,
+      selectedList: data[0] ? String(data[0].id) : '',
+    }))
     .always(() => this.hideSpinner());
   }
 

djAerolith/wordwalls/static/js/wordwalls/solutions_modal.jsx

@@ -10,7 +10,7 @@ const SolutionsModal = props => (
     modalClass="solutions-modal"
     size="modal-lg"
   >
-    <div className="modal-body">
+    <div className="modal-body" style={{ height: '80vh', overflowY: 'auto' }} >
       <Solutions
         questions={props.questions}
         answeredByMe={props.answeredByMe}

djAerolith/wordwalls/static/js/wordwalls/topbar/prefs_modal_body.jsx

@@ -190,7 +190,7 @@ class PrefsModalBody extends React.Component {
           </div>
         </div>
 
-        <div className="row">
+        <div className="row" style={{ height: '65vh', overflowY: 'auto' }}>
           <div className="col-lg-12">
 
             <form>

djAerolith/wordwalls/views.py

@@ -120,19 +120,6 @@ def handle_table_post(request, tableid):
     logger.debug(u'user=%s, action=%s, table=%s', request.user, action,
                  tableid)
 
-    # XXX: Remove this shortly after deploying SPA. This is just for the
-    # transition period.
-    if action in ['challengeSubmit', 'searchParamsSubmit', 'savedListsSubmit',
-                  'namedListsSubmit']:
-        # This is one of the old actions, for the old app (not the SPA).
-        # Return an error message using the old formatting for the app.
-        # Note the implicit 200 status code.
-        return response({
-            'success': False,
-            'error': 'Aerolith has been updated; please refresh your browser.'
-        })
-    # XXX: End of transition code.
-
     if not tableid or int(tableid) == 0:   # Kind of hacky.
         return response({
             'success': False,