Author: olamy
Date: Wed Jul 11 13:24:34 2012
New Revision: 1360167
URL: http://svn.apache.org/viewvc?rev=1360167&view=rev
Log:
prevent some 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=1360167&r1=1360166&r2=1360167&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
Wed Jul 11 13:24:34 2012
@@ -830,6 +830,7 @@ define("archiva.search",["jquery","i18n"
}
displayBrowseArtifactDetail=function(groupId, artifactId){
+ $.log("displayBrowseArtifactDetail");
window.sammyArchivaApplication.setLocation("#artifact/"+groupId+"/"+artifactId);
//displayArtifactDetail(groupId,artifactId,null,null);
}
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=1360167&r1=1360166&r2=1360167&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
Wed Jul 11 13:24:34 2012
@@ -111,21 +111,25 @@
<th>${$.i18n.prop('browse.artifact.artifactId')}</th>
<td>${artifactId}</td>
</tr>
+ {{if projectVersionMetadata}}
<tr>
<th>${$.i18n.prop('browse.artifact.name')}</th>
<td>${projectVersionMetadata.name}</td>
</tr>
+ {{/if}}
+ {{if projectVersionMetadata}}
<tr>
<th>${$.i18n.prop('browse.artifact.description')}</th>
<td>${projectVersionMetadata.description}</td>
</tr>
- {{if projectVersionMetadata.mavenFacet}}
+ {{/if}}
+ {{if projectVersionMetadata && projectVersionMetadata.mavenFacet}}
<tr>
<th>${$.i18n.prop('browse.artifact.packaging')}</th>
<td>${projectVersionMetadata.mavenFacet.packaging}</td>
</tr>
{{/if}}
- {{if projectVersionMetadata.organization}}
+ {{if projectVersionMetadata &&
projectVersionMetadata.organization}}
<tr>
<th>${$.i18n.prop('browse.artifact.organization.name')}</th>
{{if projectVersionMetadata.organization.url}}
@@ -139,7 +143,7 @@
{{/if}}
</tr>
{{/if}}
- {{if projectVersionMetadata.issueManagement}}
+ {{if projectVersionMetadata &&
projectVersionMetadata.issueManagement}}
<tr>
<th>${$.i18n.prop('browse.artifact.organization.issueManagement')}</th>
<td>
@@ -448,6 +452,7 @@
</li>
</ul>
<div class="tab-content">
+ {{if projectVersionMetadata}}
<div id="artifact-details-info-content" class="tab-pane active">
<blockquote>${projectVersionMetadata.description}</blockquote>
<div class="row-fluid">
@@ -593,6 +598,7 @@
</div>
{{/if}}
</div>
+ {{/if}}
<div id="artifact-details-dependencies-content" class="tab-pane">
