Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
#25 search defaults to contains
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-conway committed Nov 29, 2017
1 parent ac5677a commit aa9facc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ Add a global config to turn on/off certain features via metalnx.properties. This
#### NIEHS identified misc theming issues

* #22 fix search text

* #25 search - default to 'contains'
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ collections.error.info.tab=An error occured. Please contact your administrator.
collections.warning.noresources=There is no other resource available for replication. Check if this object is already replicated across all the resources on this zone.

# Metadata
metadata.search.title=Metadata Search
metadata.menu.title=Metadata
metadata.search.page.title=Search
metadata.search.page.title.popover=Search for files and collections by metadata and file properties.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
<div class="col-xs-12 tree-view-panel">
<div class="tabpanel">
<ul class="nav nav-tabs" role="tablist">
<li class="active" ><a href="#metadata-search" aria-controls="profile" role="tab" data-toggle="tab" >Metadata (AVU)</a></li>
<li class="active" ><a href="#metadata-search" aria-controls="profile" role="tab" data-toggle="tab" th:text="#{metadata.search.title}">Metadata Search</a></li>
<li ><a href="#properties-search" aria-controls="profile" role="tab" data-toggle="tab" >Properties</a></li>
</ul>
<div class="tab-content" style="border: 1px solid #ddd; background-color: #fff; padding-top: 15px;">
Expand All @@ -53,9 +53,9 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
<input type="text" class="metadataAttr metadataSearchField form-control" name="attribute" placeholder="Attribute" id="metadataAttr0"/>

<select id="" class="metadataOper metadataSearchField form-control" name="operator">
<option selected="" value="EQUAL">Is (Equals)</option>
<option value="EQUAL">Is (Equals)</option>
<option value="NOT_EQUAL">Is Not (Not Equals)</option>
<option value="LIKE">Contains</option>
<option selected="" value="LIKE">Contains</option>
<option value="NOT_LIKE">Does Not Contain</option>
</select>

Expand Down Expand Up @@ -90,9 +90,9 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
<option value="CHECKSUM" th:text="#{collections.management.checksum.label}">Checksum</option>
</select>
<select id="" class="propertiesOper form-control propertiesSearchField" name="operator">
<option selected="" value="EQUAL" th:text="#{text.is.equals}">Is (Equals)</option>
<option value="EQUAL" th:text="#{text.is.equals}">Is (Equals)</option>
<option value="NOT_EQUAL" th:text="#{text.is.not.equals}">Is Not (Not Equals)</option>
<option value="LIKE" th:text="#{text.contains}">Contains</option>
<option selected="" value="LIKE" th:text="#{text.contains}">Contains</option>
<option value="NOT_LIKE" th:text="#{text.not.contains}">Does Not Contain</option>
</select>
<input type="text" class="propertiesVal form-control propertiesSearchField" name="value" placeholder="Value" />
Expand Down Expand Up @@ -209,9 +209,9 @@ <h1 class="page-header pull-left" th:text="#{metadata.search.page.title}"></h1>
});
}else{
$(this).parents('.propertiesSearchRow').find('.propertiesOper').html(
'<option selected="" value="EQUAL">Is (Equals)</option>'+
'<option value="EQUAL">Is (Equals)</option>'+
'<option value="NOT_EQUAL">Is Not (Not Equals)</option>'+
'<option value="LIKE">Contains</option>'+
'<option selected="" value="LIKE">Contains</option>'+
'<option value="NOT_LIKE">Does Not Contain</option>'
);
}
Expand Down

0 comments on commit aa9facc

Please sign in to comment.