Build: #577 was successful Scheduled with changes by Daniel Kayiwa and Ben <ojQj@yahoo.com>

Code commits

openmrs-core master

  • Daniel Kayiwa

    Daniel Kayiwa f7759885cb0628cbbbe97abe9c57123cdca3ca96

    Revert "Another attempt at fixing randomly failing tests on bamboo:"
    This reverts commit d23fa7162393ae63a2beecdcd6c9d06a7e7cea80.

    • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version f7759885cb0628cbbbe97abe9c57123cdca3ca96)
  • Daniel Kayiwa

    Daniel Kayiwa d23fa7162393ae63a2beecdcd6c9d06a7e7cea80

    Another attempt at fixing randomly failing tests on bamboo: https://ci.openmrs.org/browse/TRUNK-MASTER-JOB1-1019/log

    • api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version d23fa7162393ae63a2beecdcd6c9d06a7e7cea80)
  • Daniel Kayiwa

    Daniel Kayiwa 8a6e83e2025f39c15f00d89e7314a8d3b39743b1

    Merge pull request #1560 from ojQj/TRUNK-4623
    Trunk 4623

  • Daniel Kayiwa

    Daniel Kayiwa 6cc98201c385faba864fdfb081deec6a1a982ef7

    Merge pull request #1559 from thilobeckmann/TRUNK-2280
    TRUNK-2280: Refactor maximum length checking in the view layer

  • Daniel Kayiwa

    Daniel Kayiwa 0804e59be5da525ce9dc6de5b8a255c44b8adfd1

    Yet another attempt at fixing travis failing test - NameSupportTest.getInstance_shouldFindNameSupportBean:31 null: https://travis-ci.org/openmrs/openmrs-core/builds/75245768

    • web/src/main/java/org/openmrs/layout/web/name/NameSupport.java (version 0804e59be5da525ce9dc6de5b8a255c44b8adfd1)
  • Daniel Kayiwa

    Daniel Kayiwa ef6c3433dbf2f8d85ef23d4cf1ca0d3520ac2957

    Another attempt at fixing failing test on travis - NameSupportTest.getInstance_shouldFindNameSupportBean:31 null: https://travis-ci.org/openmrs/openmrs-core/builds/75244583

    • web/src/main/java/org/openmrs/layout/web/name/NameSupport.java (version ef6c3433dbf2f8d85ef23d4cf1ca0d3520ac2957)
  • Daniel Kayiwa

    Daniel Kayiwa bb8257df3feaec8f4cf9c5fefe524a0960428eff

    Merge pull request #1552 from tobivogel/trunk-4463
    trunk-4463 use forEach instead of forTokens JSTL tag

  • Daniel Kayiwa

    Daniel Kayiwa 0d782f2e3eebc306d1b4ecc617038606306bc4c2

    Merge pull request #1556 from MatthiasZerau/TRUNK-4539
    Fixing bug that showing database stack traces when user input fields too long - TRUNK-4539

  • Daniel Kayiwa

    Daniel Kayiwa 6abc370f9cba6b7046aea997215d926e372c6c94

    Attempting to fix failing test on travis - NameSupportTest.getInstance_shouldFindNameSupportBean:31 null: https://travis-ci.org/openmrs/openmrs-core/builds/75074885:

    • web/src/main/java/org/openmrs/layout/web/name/NameSupport.java (version 6abc370f9cba6b7046aea997215d926e372c6c94)
  • Ben <ojQj@yahoo.com>

    Ben <ojQj@yahoo.com> c36d0459b1582a0e5ba9dd0954771043f288f0ec

    Merge branch 'TRUNK-4623' of https://github.com/ojQj/openmrs-core into TRUNK-4623

  • Ben <ojQj@yahoo.com>

    Ben <ojQj@yahoo.com> c9eeb875f8c53b8a83a64adb2d190b9b9f92c124

    Removing calls to deprecated functions https://issues.openmrs.org/browse/TRUNK-4623
    Removing deprecated Spring class copy, refactoring the calls to it, and
    adding unit tests for changed classes.

    • web/src/main/java/org/openmrs/web/taglib/FormatDateTag.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
    • web/src/main/java/org/openmrs/web/taglib/OpenmrsHtmlEscapingAwareTag.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
    • web/src/main/java/org/openmrs/web/taglib/OpenmrsMessageTag.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
    • web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
    • web/src/test/java/org/openmrs/web/taglib/OpenmrsHtmlEscapingAwareTagTest.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
    • web/src/test/java/org/openmrs/web/taglib/OpenmrsMessageTagTest.java (version c9eeb875f8c53b8a83a64adb2d190b9b9f92c124)
  • Ben <ojQj@yahoo.com>

    Ben <ojQj@yahoo.com> 704cf15d9f8a39df7f50824efa7d941421c19ae2 m

    Removing calls to deprecated functions https://issues.openmrs.org/browse/TRUNK-4623
    Removing deprecated Spring class copy, refactoring the calls to it, and
    adding unit tests for changed classes.

    • web/src/main/java/org/openmrs/web/taglib/FormatDateTag.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
    • web/src/main/java/org/openmrs/web/taglib/OpenmrsHtmlEscapingAwareTag.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
    • web/src/main/java/org/openmrs/web/taglib/OpenmrsMessageTag.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
    • web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
    • web/src/test/java/org/openmrs/web/taglib/OpenmrsHtmlEscapingAwareTagTest.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
    • web/src/test/java/org/openmrs/web/taglib/OpenmrsMessageTagTest.java (version 704cf15d9f8a39df7f50824efa7d941421c19ae2)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> bb58f376d53f91473374415a8cd3d95f78de1197 m

    TRUNK-2280: Add hint to all limited textarea elements. Refactor event handling on textareas so that cut, paste, typing and deletions are recognized and update the hint message accordingly.

    • webapp/src/main/webapp/WEB-INF/messages.properties (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/messages_de.properties (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/template/headerFull.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl (version bb58f376d53f91473374415a8cd3d95f78de1197)
    • webapp/src/main/webapp/openmrs.js (version bb58f376d53f91473374415a8cd3d95f78de1197)
  • Matthias Zerau <matzes.mailbox@gmx.de>

    Matthias Zerau <matzes.mailbox@gmx.de> 6bb65625c3661e3027433258b31a58cd05c6abad m

    TRUNK-4539: bugfix for user validation
    Fixing bug showing database stack traces in the UI if user input values
    are too long.

    • api/src/main/java/org/openmrs/validator/UserValidator.java (version 6bb65625c3661e3027433258b31a58cd05c6abad)
    • api/src/test/java/org/openmrs/validator/UserValidatorTest.java (version 6bb65625c3661e3027433258b31a58cd05c6abad)
    • web/src/main/java/org/openmrs/web/controller/user/UserFormController.java (version 6bb65625c3661e3027433258b31a58cd05c6abad)
    • web/src/test/java/org/openmrs/web/controller/user/UserFormControllerTest.java (version 6bb65625c3661e3027433258b31a58cd05c6abad)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62 m

    TRUNK-2280: remove duplicated forceMaxLength methods and change onkeypress to oninput, to get user input after instead of before being inserted into the textareas

    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp (version f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62)
    • webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp (version f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62)
    • webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp (version f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62)
    • webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp (version f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62)
    • webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp (version f6bb7c1d3c3c2de8dab49d9b39d39c38afea7f62)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> c12986fcbd978246c8ed12f152d85c45df8e680f m

    TRUNK-2280: Add return false to cancel user input on exceeded size limit and not remove last character silently

    • webapp/src/main/webapp/openmrs.js (version c12986fcbd978246c8ed12f152d85c45df8e680f)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> bffcc2034a452eec437a3b0f0050423af8d02951 m

    TRUNK-2280: add unit tests for additional description length validation

    • api/src/test/java/org/openmrs/validator/EncounterTypeValidatorTest.java (version bffcc2034a452eec437a3b0f0050423af8d02951)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> 5830f6486cf6aa73442e1682585a77d828971610 m

    TRUNK-2280: improved stability of javascript length check

    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp (version 5830f6486cf6aa73442e1682585a77d828971610)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> dbaf84c923646725a50a6b25740c2f5cb4c7a6d4 m

    TRUNK-2280: Removed duplicate status check

    • webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp (version dbaf84c923646725a50a6b25740c2f5cb4c7a6d4)
  • thilobeckmann <github@thilobeckmann.de>

    thilobeckmann <github@thilobeckmann.de> 3fa67a92a2e3fe9c08d8172c2a67f2ddd035aa71 m

    TRUNK-2280: added description field to field length validations

    • api/src/main/java/org/openmrs/validator/EncounterTypeValidator.java (version 3fa67a92a2e3fe9c08d8172c2a67f2ddd035aa71)
  • tobi vogel <tvogel@thoughtworks.com>

    tobi vogel <tvogel@thoughtworks.com> af09673692dc12e88970cf32e26dbddea809a548 m

    trunk-4463 use forEach instead of forTokens JSTL tag - delimiter for multiple elements in Strings stays (implicitly) comma

    • webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp (version af09673692dc12e88970cf32e26dbddea809a548)