honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIx unit tests

This commit is contained in:
jamesagnew 2014-06-25 13:54:44 -04:00
parent 1916656e6e
commit cf63f6bacf
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hapi-fhir-base/pom.xml
View File

@ -18,9 +18,12 @@
<distributionManagement>
<site>
<id>hl7api.sf.net</id>
<url>scp://shell.sourceforge.net/home/project-web/hl7api/htdocs/hapi-fhir</url>
<id>git.server</id>
<url>scm:git:ssh://git@github.com:jamesagnew/hapi-fhir.git</url>
</site>
<!-- <site> <id>hl7api.sf.net</id> <url>scp://shell.sourceforge.net/home/project-web/hl7api/htdocs/hapi-fhir</url>
</site> -->
</distributionManagement>
<dependencies>
@ -52,7 +55,8 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>2.1.3.RELEASE</version>
<!-- Note that 2.1.3 has a bug where it double escapes text -->
<version>2.1.2.RELEASE</version>
<optional>true</optional>
</dependency>
@ -447,6 +451,23 @@
<filtering>true</filtering>
</resource>
</resources>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-scm</artifactId>
<version>2.6</version>
</extension>
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
<version>1.9</version>
</extension>
<extension>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
<version>1.9</version>
</extension>
</extensions>
</build>
<profiles>

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ReadMethodBinding.java
View File

@ -92,8 +92,10 @@ public class ReadMethodBinding extends BaseResourceReturningMethodBinding implem
return false;
}
}
if ((theRequest.getVersionId() == null) != (mySupportsVersion == false && myVersionIdIndex == null)) {
return false;
if (mySupportsVersion == false) {
if ((theRequest.getVersionId() == null) != (myVersionIdIndex == null)) {
return false;
}
}
if (theRequest.getId() == null) {
return false;

13
hapi-fhir-base/src/main/resources/ca/uhn/fhir/rest/server/tester/RestfulTester.html
View File

@ -711,7 +711,7 @@
<div class="input-group-addon">
ID
</div>
<input type="text" class="form-control" id="resource-create-id" placeholder="(add for update)" th:value="${#strings.defaultString(updateResourceId,'')}"/>
<input type="text" class="form-control" id="resource-create-id" placeholder="(add for update)" th:value="${updateResourceId}"/>
</div>
</div>
</div>
@ -1045,19 +1045,12 @@
</button>
</h4>
<script type="text/javascript" th:if="${resultBodyIsLong}">
<<<<<<< HEAD
$('#page-next-btn').click(function() {
var btn = $(this);
btn.button('loading');
btn.append($('<input />', { type: 'hidden', name: 'page-url', value: '<th:block th:text="${bundle.linkNext}"/>' }));
=======
$('#format-result-btn').click(function() {
//$('#resultBodyActualPre').setClass('<th:block th:text="${resultSyntaxHighlighterClass}"/>');
document.getElementById('resultBodyActualPre').className='<th:block th:text="${resultSyntaxHighlighterClass}"/>';
document.getElementById('format-result-btn').disabled ='disabled';
SyntaxHighlighter.highlight();
lineWrap();
>>>>>>> 68ea31495cec63706de85e729f19eb863cc835f9
});
</script>
</div>
@ -1136,11 +1129,7 @@
</div>
</div>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="js/bootstrap.min.js"></script>
</form>
</body>
</html>