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: 8a59c24d8e11
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: 1288f4d9ebf6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 29, 2014

  1. The concept page has no extension point that gives you the conceptId

    @sachethgupta
    sachethgupta committed Jan 29, 2014
    Copy the full SHA
    3cf4c5c View commit details

Commits on Jan 30, 2014

  1. Merge pull request #594 from sachethgupta/TRUNK-3984 

    TRUNK - 3984 The concept page has no extension point that gives you the conceptId
    @dkayiwa
    dkayiwa committed Jan 30, 2014

    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
    1288f4d View commit details
Showing with 3 additions and 3 deletions.
  1. +2 −2 webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
  2. +1 −1 webapp/src/main/webapp/WEB-INF/view/dictionary/conceptStatsForm.jsp
4 changes: 2 additions & 2 deletions webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -205,7 +205,7 @@
</c:if>
</c:if>

<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormHeader" type="html" />
<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormHeader" type="html" parameters="conceptId=${command.concept.conceptId}"/>
<div id="conceptMainarea">
<form method="post" action="">

@@ -962,7 +962,7 @@ function resetNewTermForm(){
</script>
</openmrs:hasPrivilege>

<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormFooter" type="html" />
<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormFooter" type="html" parameters="conceptId=${command.concept.conceptId}" />

<div id="addAnswer" style="display: none">
<div id="addAnswerError"><openmrs:message code="Concept.noConceptSelected"/></div>
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/WEB-INF/view/dictionary/conceptStatsForm.jsp
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@

<openmrs:hasPrivilege privilege="Edit Concepts"><a href="concept.form" id="newConcept" valign="middle"></openmrs:hasPrivilege><openmrs:message code="general.new"/><openmrs:hasPrivilege privilege="Edit Concepts"></a></openmrs:hasPrivilege>

<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormHeader" type="html" />
<openmrs:extensionPoint pointId="org.openmrs.dictionary.conceptFormHeader" type="html" parameters="conceptId=${command.concept.conceptId}" />

<form class="inlineForm" action="index.htm" method="get">
&nbsp; &nbsp; &nbsp;