[MediaWiki-commits] [Gerrit] wikimedia...discernatron[master]: Add buttons to switch between classic/solitaire

[EBernhardson (Code Review)]

EBernhardson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310365

Change subject: Add buttons to switch between classic/solitaire
......................................................................

Add buttons to switch between classic/solitaire

Change-Id: Ie348a81ddfb6bf446f2e08725347997f7cd41695
---
M src/RelevanceScoring/Controller/QueriesController.php
M views/score_query.twig
M views/score_query_cards.twig
3 files changed, 22 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/discernatron 
refs/changes/65/310365/1

diff --git a/src/RelevanceScoring/Controller/QueriesController.php 
b/src/RelevanceScoring/Controller/QueriesController.php
index 78caf73..fd2b822 100644
--- a/src/RelevanceScoring/Controller/QueriesController.php
+++ b/src/RelevanceScoring/Controller/QueriesController.php
@@ -137,7 +137,7 @@
         $form = $this->createScoringForm($results);
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isValid() && !$request->request->has('cards')) {
             $this->scoresRepo->storeQueryScores($this->user, $queryId, 
$form->getData());
             $this->scoringQueueRepo->markScored($this->user, $queryId);
 
@@ -154,6 +154,7 @@
             'saved' => (bool) $request->query->get('saved'),
             'skipForm' => $this->createSkipForm($queryId)->createView(),
             'baseWikiUrl' => $this->getBaseUrl($query['wiki']),
+            'showErrors' => !$request->request->has('cards'),
         ]);
     }
 
@@ -251,6 +252,10 @@
     private function chooseScoringTemplate(Request $request)
     {
         $fromQuery = $request->query->get('cards', null);
+        if ( $fromQuery === null ) {
+            $fromQuery = $request->request->get('cards', null);
+        }
+
         if ($fromQuery !== null) {
             // override requested
             $interface = (bool) $fromQuery
diff --git a/views/score_query.twig b/views/score_query.twig
index 0e38a52..6ace873 100644
--- a/views/score_query.twig
+++ b/views/score_query.twig
@@ -63,15 +63,19 @@
 
     <div class="row"><h3>Results</h3></div>
 
-    <div class="row">
-        <a class="btn btn-default hidden show-all-snippets">Show all 
snippets</a>
-        <a class="btn btn-default hidden hide-all-snippets">Hide all 
snippets</a>
-    </div>
-
     <form method="post" novalidate>
-        {{ form_errors(form) }}
+        <div class="row">
+            <a class="btn btn-default hidden show-all-snippets">Show all 
snippets</a>
+            <a class="btn btn-default hidden hide-all-snippets">Hide all 
snippets</a>
+            <button class="btn btn-default" type="submit" name="cards" 
value="1">Switch to card interface</button>
+        </div>
+
+        {% if showErrors %}
+            {{ form_errors(form) }}
+        {% endif %}
         {{ form_widget(form._token) }}
 
+
         {% for child in form %}
             {% if child.vars.name != '_token' %}
                 <div class="result">
diff --git a/views/score_query_cards.twig b/views/score_query_cards.twig
index 1c3d0cc..145bdc2 100644
--- a/views/score_query_cards.twig
+++ b/views/score_query_cards.twig
@@ -42,10 +42,13 @@
         {% endfor %}
         <div class="row">
             <input type="submit" class="btn btn-default" />
+            <button type="submit" class="btn btn-default" name="cards" 
value="0">Switch to classic interface</button>
         </div>
-        <div class="error">
-            {{ form_errors(form) }}
-        </div>
+        {% if showErrors %}
+            <div class="error">
+                {{ form_errors(form) }}
+            </div>
+        {% endif %}
     </form>
 
     <div class="row">

-- 
To view, visit https://gerrit.wikimedia.org/r/310365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie348a81ddfb6bf446f2e08725347997f7cd41695
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/discernatron
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits