Merge pull request #564 from DimalChandrasiri/release-2.0.x

Release 2.0.x

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs

@@ -50,9 +50,9 @@
                 <div class="wr-form">
                     <p class="page-sub-title">Advanced Device Search</p>
                     <hr/>
-                    <div id="device-listing-status" class="raw hidden">
+                    <div id="device-listing-status" class="row hidden">
                         <div class="col-lg-12 col-md-12">
-                            <ul style="list-style-type: none;">
+                            <ul style="list-style-type: none; padding:0px;">
                                 <li class="message message-info">
                                     <h4>
                                         <i class="icon fw fw-info"></i>
@@ -91,6 +91,8 @@
                         <div id="customSearchParam" class="col-lg-10 col-md-10">
 
                     </div>
+                    <div class="row">
+                        <div id="customSearchParam" class="col-lg-12 col-md-12"></div>
                     </div>
                 </div>
             </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js

@@ -460,8 +460,12 @@ function loadDevices(searchType, searchParam) {
                 $("#loading-content").remove();
                 attachDeviceEvents();
 
+                if($('.advance-search').length < 1){
                     $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input')
-                    .after('<a href="'+context+'/devices/search" class="add-padding-3x">Advance Search</a>')
+                        .after('<a href="'+context+'/devices/search"' +
+                            ' class="advance-search add-padding-3x">Advance Search</a>');
+                }
+
             }, {
                 "placeholder": "Search By Device Name",
                 "searchKey": "name"