Remove Advanced Search functionality. Fix #448, #108

kiwitcms · Jul 29, 2018 · 4f36f1e · 4f36f1e
1 parent 4e451c7
commit 4f36f1e
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 843 deletions.
diff --git a/docs/source/modules/tcms.search.advanced_search.rst b/docs/source/modules/tcms.search.advanced_search.rst
diff --git a/docs/source/modules/tcms.search.rst b/docs/source/modules/tcms.search.rst
@@ -11,7 +11,6 @@ Submodules
 
 .. toctree::
 
-   tcms.search.advanced_search
    tcms.search.forms
    tcms.search.order
    tcms.search.query

diff --git a/tcms/search/advanced_search.py b/tcms/search/advanced_search.py
diff --git a/tcms/search/tests.py b/tcms/search/tests.py
diff --git a/tcms/static/images/containerTab_bg_grey.png b/tcms/static/images/containerTab_bg_grey.png
diff --git a/tcms/static/js/testplan_actions.js b/tcms/static/js/testplan_actions.js
@@ -853,7 +853,7 @@ Nitrate.TestPlans.SearchCase.on_load = function() {
   }
   // new feature for searching by case id.
   var quick_search = jQ("#tp_quick_search_cases_form");
-  var normal_search = jQ("#tp_advanced_search_case_form");
+  var normal_search = jQ("#tp_normal_search_case_form");
   var quick_tab = jQ("#quick_tab");
   var normal_tab = jQ("#normal_tab");
   var search_mode = jQ("#search_mode");
@@ -876,7 +876,7 @@ Nitrate.TestPlans.SearchCase.on_load = function() {
       "hide_tab": normal_tab
     });
   });
-  jQ("#advanced_search_cases").bind("click", function() {
+  jQ("#normal_search_cases").bind("click", function() {
     // clear errors
     errors.empty();
     search_mode.val("normal");

diff --git a/tcms/static/style/base.css b/tcms/static/style/base.css
@@ -791,38 +791,11 @@ ul.data_content_title li{ display:inline-block; margin-left:3px;}
 .list_filter .priority_filter ul li{ float:left; padding:0px; margin:0px;}
 .list_filter td  input[ type="text" ]{ width:100%;}
 
-/* advancedSearch */
-
-.advancedSearch{padding:10px; width:1200px; margin:0px auto;}
-.advancedSearch h2{margin:0px; padding:0 0 0 8px;}
-.advancedSearch .selectM{height:70px;}
-.advancedSearch .product li{float:left; width:18%;}
-.advancedSearch .product li.btn10{width:10%;}
-.advancedSearch .product li h4{margin:0px; font-weight:normal; padding:0 0 3px 2px; color:#004481;}
-.advancedSearch .product li h4 span{color:red; padding-right:3px;}
-.advancedSearch .product li select{width:205px;}
-.advancedSearch .productSelected{border:1px solid #FFE4B5; background:#FFF8E9; padding:2px 5px 0 5px; margin:10px 0 0 0;}
-.advancedSearch .productSelected li span{float:left; width:18%; padding:5px 0 3px 2px; display:block;}
-.advancedSearch .productSelected li.clear{border-bottom:1px solid #FFE4B5; width:auto; clear:both;}
-.advancedSearch .planCaseRun{padding:10px 0 0 0;}
-.advancedSearch .planCaseRun .containerTabGrey{float:left; width:32%; margin:0 0.5%;}
-.advancedSearch .planCaseRun .containerTabGrey .content{padding:10px 5px 20px 0;}
-.advancedSearch .planCaseRun .title{width:100px;}
-.advancedSearch .planCaseRun .listinfo{padding:5px 0;}
-.advancedSearchTip h3{margin-left:0px; margin-top:0px;}
-.advancedSearchTip h4{margin:0 0 0 20px;}
-.advancedSearchTip ul{margin-left:10px;}
-.advancedSearchTip li{color:#FF6600; list-style: disc; margin-left:10px;}
-.advancedSearchTip p{margin:0; color:#333333;}
 .queries{border:1px solid #FFE4B5; background:#FFF8E9; float:left; margin:10px; padding:5px 10px;}
 .queries li{float:left; padding:0 15px 0 0; list-style:none;}
 .queries li label{padding:0 3px 0 0; color:#999999;}
 .queries p{clear:none; padding:0px; margin:0px;}
 
-.containerTabGrey .top{height:16px; background:url(../images/containerTab_bg_grey.png) repeat-x 0px 15px;}
-.containerTabGrey .top h3{height:16px; line-height:18px; width:70px; margin:0px; background:url(../images/containerTab_bg_grey.png) no-repeat; text-align:center; color:#0E5A99; font-size:12px;}
-.containerTabGrey .content{border:1px solid #CCCCCC; border-top-width:0px; background:#FFFFFF;}
-
 /* caserun stutas icon */
 .icon_status {display:inline-block; padding-left:23px; height:23px; line-height:23px; background:url(../images/ico_status.png) no-repeat;}
 .btn_status {display:inline-block; width:23px; height:23px; line-height:23px; background:url(../images/ico_status.png) no-repeat; margin-right:4px; border:0px; float:left; cursor:pointer;}

diff --git a/tcms/templates/advanced_search/deprecation_warning.html b/tcms/templates/advanced_search/deprecation_warning.html
diff --git a/tcms/templates/case/common/case_advance_filtered.html b/tcms/templates/case/common/case_advance_filtered.html
diff --git a/tcms/templates/navigation.html b/tcms/templates/navigation.html
@@ -139,12 +139,6 @@
                         <li>
                             <a href="{% url "testcases-search" %}" target="_parent">Search Test Cases</a>
                         </li>
-
-                        <li class="divider"></li>
-
-                        <li>
-                            <a href="/advance-search/" target="_parent">Advanced search</a>
-                        </li>
                     </ul>
                 </li>