IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Use date picker on full page search

Browse Source
This commit is contained in:
Robin Ward
2017-11-21 12:52:09 -05:00
parent 7669146897
commit 7533e5b541
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs
View File

@@ -76,7 +76,7 @@
<label class="control-label" for="search-post-date">{{i18n "search.advanced.post.time.label"}}</label> <label class="control-label" for="search-post-date">{{i18n "search.advanced.post.time.label"}}</label>
<div class="controls"> <div class="controls">
{{combo-box id="postTime" valueAttribute="value" content=postTimeOptions value=searchedTerms.time.when}} {{combo-box id="postTime" valueAttribute="value" content=postTimeOptions value=searchedTerms.time.when}}
{{input type="date" value=searchedTerms.time.days class="input-small" id='search-post-date'}} {{date-picker value=searchedTerms.time.days id="search-post-date"}}
</div> </div>
</div> </div>
<div class="control-group pull-left"> <div class="control-group pull-left">

3
test/javascripts/acceptance/search-full-test.js.es6
View File

@@ -285,14 +285,13 @@ QUnit.test("update post time through advanced search ui", assert => {
visit("/search"); visit("/search");
fillIn('.search input.full-page-search', 'none'); fillIn('.search input.full-page-search', 'none');
click('.search-advanced-btn'); click('.search-advanced-btn');
fillIn('#search-post-date', '2016-10-05'); fillIn('#search-post-date .date-picker', '2016-10-05');
expandSelectKit('.search-advanced-options .select-kit#postTime'); expandSelectKit('.search-advanced-options .select-kit#postTime');
selectKitSelectRow('after', { selector: '.search-advanced-options .select-kit#postTime' }); selectKitSelectRow('after', { selector: '.search-advanced-options .select-kit#postTime' });
fillIn('.search-advanced-options .select-kit#postTime', 'after'); fillIn('.search-advanced-options .select-kit#postTime', 'after');
andThen(() => { andThen(() => {
assert.ok(exists(selectKit('.search-advanced-options .select-kit#postTime').rowByName("after").el), 'has "after" populated'); assert.ok(exists(selectKit('.search-advanced-options .select-kit#postTime').rowByName("after").el), 'has "after" populated');
assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" populated');
assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"'); assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
}); });
}); });