Author: olamy
Date: Tue Jun 5 21:44:13 2012
New Revision: 1346613
URL: http://svn.apache.org/viewvc?rev=1346613&view=rev
Log:
prevent js npe
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1346613&r1=1346612&r2=1346613&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Tue Jun 5 21:44:13 2012
@@ -895,7 +895,7 @@ define("search",["jquery","i18n","jquery
}
return projectVersionMetadata;
}
- return null;
+ return new ProjectVersionMetadata();
}
MavenFacet=function(packaging,parent){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1346613&r1=1346612&r2=1346613&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Tue Jun 5 21:44:13 2012
@@ -468,17 +468,23 @@
</tr>
<tr>
<th>${$.i18n.prop('browse.artifact.packaging')}</th>
- <td>${projectVersionMetadata.mavenFacet.packaging}</td>
- </tr>
- {{if projectVersionMetadata.mavenFacet.parent }}
- <tr>
- <th>${$.i18n.prop('browse.artifact.parent')}</th>
- <td>
- <a href="#" data-bind="click: displayParent">
-
${projectVersionMetadata.mavenFacet.parent.groupId}:${projectVersionMetadata.mavenFacet.parent.artifactId}:${projectVersionMetadata.mavenFacet.parent.version}
- </a>
- </td>
+ {{if projectVersionMetadata.mavenFacet}}
+ <td>${projectVersionMetadata.mavenFacet.packaging}</td>
+ {{else}}
+ <td></td>
+ {{/if}}
</tr>
+ {{if projectVersionMetadata.mavenFacet}}
+ {{if projectVersionMetadata.mavenFacet.parent }}
+ <tr>
+ <th>${$.i18n.prop('browse.artifact.parent')}</th>
+ <td>
+ <a href="#" data-bind="click: displayParent">
+
${projectVersionMetadata.mavenFacet.parent.groupId}:${projectVersionMetadata.mavenFacet.parent.artifactId}:${projectVersionMetadata.mavenFacet.parent.version}
+ </a>
+ </td>
+ </tr>
+ {{/if}}
{{/if}}
</tbody>
</table>
