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: a19e732b6f6a
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: a8ab9aac8f4c
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 13, 2013

  1. TRUNK-3811: On successful save of Concept one should go to View Conce… 

    …pt Screen
    @saramirza14
    saramirza14 committed Mar 13, 2013
    Copy the full SHA
    a3959ec View commit details

Commits on Mar 28, 2013

  1. TRUNK-3811: On successful save of Concept one should go to View Conce… 

    …pt Screen
    @saramirza14
    saramirza14 committed Mar 28, 2013
    Copy the full SHA
    b6312e4 View commit details

Commits on Apr 2, 2013

  1. TRUNK-3811: On successful save of Concept one should go to View Conce… 

    …pt Screen
    @saramirza14
    saramirza14 committed Apr 2, 2013
    Copy the full SHA
    85129fe View commit details

Commits on Apr 3, 2013

  1. TRUNK-3811: On successful save of Concept one should go to View Conce… 

    …pt Screen
    @saramirza14
    saramirza14 committed Apr 3, 2013
    Copy the full SHA
    cec2f0d View commit details

Commits on Apr 4, 2013

  1. Merge pull request #237 from saramirza14/TRUNK-3811 

    TRUNK-3811: On successful save of Concept one should go to View Concept ...
    @rkorytkowski
    rkorytkowski committed Apr 4, 2013
    Copy the full SHA
    a8ab9aa View commit details
6 changes: 6 additions & 0 deletions web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
View file
Original file line number Diff line number Diff line change
@@ -260,8 +260,14 @@ protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse
validateConceptUsesPersistedObjects(concept, errors);

if (!errors.hasErrors()) {
if (action.equals(msa.getMessage("Concept.cancel"))) {
return new ModelAndView(new RedirectView("index.htm"));
}
cs.saveConcept(concept);
httpSession.setAttribute(WebConstants.OPENMRS_MSG_ATTR, "Concept.saved");
if (action.equals(msa.getMessage("Concept.save"))) {
return new ModelAndView(new RedirectView("concept.htm" + "?conceptId=" + concept.getConceptId()));
}
return new ModelAndView(new RedirectView(getSuccessView() + "?conceptId=" + concept.getConceptId()));
}
httpSession.setAttribute(WebConstants.OPENMRS_ERROR_ATTR, "Concept.cannot.save");
2 changes: 2 additions & 0 deletions webapp/src/main/webapp/WEB-INF/messages.properties
View file
Original file line number Diff line number Diff line change
@@ -464,6 +464,8 @@ Concept.conceptSets=Set Members
Concept.conceptSets.help=Concepts that are considered to be packaged under the current concept
Concept.conceptSets.empty=(Empty Set)
Concept.save=Save Concept
Concept.saveAndContinue=Save and Continue
Concept.cancel=Cancel
Concept.delete=Delete Concept
Concept.find=Find Concept(s)
Concept.retiredMessage=This concept is retired
3 changes: 2 additions & 1 deletion webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -739,7 +739,8 @@
<div id="saveDeleteButtons" style="margin-top: 15px">
<c:if test="${conceptsLocked != 'true'}">
<input type="submit" name="action" value="<openmrs:message code="Concept.save"/>" onMouseUp="removeHiddenRows()"/>

<input type="submit" name="action" value="<openmrs:message code="Concept.saveAndContinue"/>" onMouseUp="removeHiddenRows()" />
<input type="submit" name="action" value="<openmrs:message code="Concept.cancel"/>" onMouseUp="removeHiddenRows()" />
<c:if test="${command.concept.conceptId != null}">
<openmrs:hasPrivilege privilege="Delete Concepts">
&nbsp; &nbsp; &nbsp;