Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix regression in json/boolean due to parameter to fix transformation of 2.0 to 2 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1294407 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-02-28 00:04:05 +00:00
parent c6946043df
commit 49bccb5d33
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
View File

@ -42,6 +42,7 @@
<bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider"> <bean id="jsonProvider" class="org.apache.cxf.jaxrs.provider.JSONProvider">
<!-- without that String 2.0 are transformed to 2 which is not correct for versions --> <!-- without that String 2.0 are transformed to 2 which is not correct for versions -->
<!-- side effect json boolean are string rather than boolean -->
<property name="convertTypesToStrings" value="true"/> <property name="convertTypesToStrings" value="true"/>
<!--property name="serializeAsArray" value="true"/--> <!--property name="serializeAsArray" value="true"/-->

12
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
View File

@ -149,9 +149,11 @@ $(function() {
if (data==null){ if (data==null){
return null; return null;
} }
return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots,data.releases, return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots=='true'
data.blockRedeployments,data.cronExpression, ,data.releases=='true',
data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,data.stageRepoNeeded); data.blockRedeployments=='true',data.cronExpression,
data.scanned=='true',data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots=='true',
data.stageRepoNeeded=='true');
} }
mapArchivaRepositoryStatistics=function(data){ mapArchivaRepositoryStatistics=function(data){
@ -591,8 +593,8 @@ $(function() {
return null; return null;
} }
return new RemoteRepository(data.id,data.name,data.layout,data.indexDirectory,data.url,data.userName,data.password, return new RemoteRepository(data.id,data.name,data.layout,data.indexDirectory,data.url,data.userName,data.password,
data.timeout,data.downloadRemoteIndex,data.remoteIndexUrl,data.remoteDownloadNetworkProxyId, data.timeout,data.downloadRemoteIndex=='true',data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup); data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup=='true');
} }
mapRemoteRepositories=function(data){ mapRemoteRepositories=function(data){