From a57f6f39d888154c77b54a0c4422bb45b2a90646 Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Wed, 13 Jun 2018 11:27:38 +0900
Subject: [PATCH] Update search

---
 doccano/app/server/static/annotation.1.js      | 5 +++--
 doccano/app/server/templates/annotation.1.html | 9 ---------
 doccano/app/server/views.py                    | 2 ++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/doccano/app/server/static/annotation.1.js b/doccano/app/server/static/annotation.1.js
index e28a1934..70d37fb0 100644
--- a/doccano/app/server/static/annotation.1.js
+++ b/doccano/app/server/static/annotation.1.js
@@ -26,7 +26,6 @@ var vm = new Vue({
         total: 0,
         remaining: 0,
         searchQuery: '',
-        history: []
     },
 
     methods: {
@@ -90,7 +89,9 @@ var vm = new Vue({
             axios.get('/' + base_url + '/apis/search?keyword=' + this.searchQuery)
                 .then(function (response) {
                     console.log('search response');
-                    self.history = response.data['data'];
+                    console.log(response.data['data']);
+                    self.items = response.data['data'];
+                    self.searchQuery = '';
                 })
                 .catch(function (error) {
                     console.log('ERROR!! happend by Backend.')
diff --git a/doccano/app/server/templates/annotation.1.html b/doccano/app/server/templates/annotation.1.html
index 07da2775..15756353 100644
--- a/doccano/app/server/templates/annotation.1.html
+++ b/doccano/app/server/templates/annotation.1.html
@@ -8,15 +8,6 @@
                     <span class="compose">Active Learn</span>
                 </a>
             </div>
-            <!--
-            <div class="main">
-                <a href="#" class="item active">
-                    <span class="icon">
-                        <i class="fa fa-inbox"></i>
-                    </span>
-                    <span class="name">Inbox</span>
-                </a>
-            </div>-->
             <aside class="menu">
                 <p class="menu-label" style="color:#f2f2f2;">
                     Progress
diff --git a/doccano/app/server/views.py b/doccano/app/server/views.py
index 7ebe4b66..68a7676c 100644
--- a/doccano/app/server/views.py
+++ b/doccano/app/server/views.py
@@ -82,6 +82,8 @@ class SearchAPI(View):
         docs = Document.objects.filter(text__contains=keyword)
         labels = [[a.as_dict() for a in Annotation.objects.filter(data=d.id)] for d in docs]
         docs = [{**d.as_dict(), **{'labels': []}} for d in docs]
+        if not docs:
+            docs = [{'id': None, 'labels': [], 'text': ''}]
         # Annotation.objects.select_related('data').all().filter(data__text__contains=keyword)
 
         return JsonResponse({'data': docs})