Selaa lähdekoodia

HUE-1674 [beeswax] Query history search is broken

Romain Rigaux 12 vuotta sitten
vanhempi
commit
28b3819

+ 5 - 0
apps/beeswax/src/beeswax/templates/beeswax_components.mako

@@ -188,18 +188,23 @@ ${field.label_tag() | n}
     href="?q-page=${num}&${filter_params}"
   % endif
 </%def>
+
 <%def name="prevpage(page)">
   ${pageref(page.previous_page_number())}
 </%def>
+
 <%def name="nextpage(page)">
   ${pageref(page.next_page_number())}
 </%def>
+
 <%def name="toppage(page)">
   ${pageref(1)}
 </%def>
+
 <%def name="bottompage(page)">
   ${pageref(page.num_pages())}
 </%def>
+
 <%def name="pagination(page)">
     <div class="pagination">
         <ul class="pull-right">

+ 2 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -13,6 +13,7 @@
 ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
+
 <%!
 import time
 from desktop.views import commonheader, commonfooter
@@ -150,7 +151,7 @@ ${ layout.menubar(section='history') }
             </tbody>
           </table>
 
-                ${comps.pagination(page)}
+                ${ comps.pagination(page) }
               </p>
             </div>
           </div>

+ 0 - 2
apps/beeswax/src/beeswax/tests.py

@@ -1209,8 +1209,6 @@ def test_index_page():
 
 
 def test_history_page():
-  raise SkipTest
-
   client = make_logged_in_client()
   test_user = User.objects.get(username='test')
 

+ 1 - 1
apps/beeswax/src/beeswax/views.py

@@ -1358,7 +1358,7 @@ def _list_query_history(user, querydict, page_size, prefix=""):
     _update_query_state(history.get_full_object())
 
   # We need to pass the parameters back to the template to generate links
-  keys_to_copy = [ prefix + key for key in ('user', 'type', 'sort', 'design_id', 'auto_query') ]
+  keys_to_copy = [ prefix + key for key in ('user', 'type', 'sort', 'design_id', 'auto_query', 'search') ]
   filter_params = copy_query_dict(querydict, keys_to_copy)
 
   return page, filter_params