Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: acc9735be604
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 08c3d51ba8ec
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 9, 2013

  1. @lplotni/@jthoenes: Boyscout - removing unused private method.

    Lukasz Plotnicki committed Nov 9, 2013

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: D65FA8C78F3BA13A
    Learn about vigilant mode
    Copy the full SHA
    5632725 View commit details

  2. @lplotni/@jthoenes: TRUNK-3834 Removed the if statement responsible f… 

    …or the extending of the SEARCH_DELAY if the search string was below the minSearchLength
    Lukasz Plotnicki committed Nov 9, 2013

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    292dc4e View commit details

Commits on Nov 19, 2013

  1. Merge pull request #444 from lplotni/TRUNK-3834 

    Fixing TRUNK-3834
    @dkayiwa
    dkayiwa committed Nov 19, 2013

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    08c3d51 View commit details
24 changes: 2 additions & 22 deletions api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1648,28 +1648,8 @@ public Integer getCountOfPatients(String query) {
List<PatientIdentifierType> emptyList = new Vector<PatientIdentifierType>();
return OpenmrsUtil.convertToInteger(dao.getCountOfPatients(null, query, emptyList, false, true));
}

/**
* Method returns the minimum number of search characters
*
* @return the value of min search characters
*/
private int getMinSearchCharacters() {
int minSearchCharacters = OpenmrsConstants.GLOBAL_PROPERTY_DEFAULT_MIN_SEARCH_CHARACTERS;
String minSearchCharactersStr = Context.getAdministrationService().getGlobalProperty(
OpenmrsConstants.GLOBAL_PROPERTY_MIN_SEARCH_CHARACTERS);

try {
minSearchCharacters = Integer.valueOf(minSearchCharactersStr);
}
catch (NumberFormatException e) {
//do nothing
}

return minSearchCharacters;
}

/**

/**
* @see PatientService#getPatients(String, Integer, Integer)
*/
@SuppressWarnings("unchecked")
8 changes: 1 addition & 7 deletions webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
View file
Original file line number Diff line number Diff line change
@@ -313,12 +313,6 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
if(!inSerialMode && ajaxTimer)
window.clearInterval(ajaxTimer);

var searchDelay = SEARCH_DELAY;
if(text.length < o.minLength && !self.options.doSearchWhenEmpty) {
// force a longer delay since we are going to search on a shorter string
searchDelay = 3000;
}

//if there is any delay in progress, cancel it
if(self._searchDelayTimer != null)
window.clearTimeout(self._searchDelayTimer);
@@ -338,7 +332,7 @@ function OpenmrsSearch(div, showIncludeVoided, searchHandler, selectionHandler,
self.options.initialData = null;

self._doSearch(text);
}, searchDelay);
}, SEARCH_DELAY);

return true;
});