You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/23 09:33:16 UTC

svn commit: r1304228 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva: search.js templates/search.html

Author: olamy
Date: Fri Mar 23 08:33:16 2012
New Revision: 1304228

URL: http://svn.apache.org/viewvc?rev=1304228&view=rev
Log:
[MRM-1615] Artifact detail view
implements dependees tab.

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/archiva/templates/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=1304228&r1=1304227&r2=1304228&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 Fri Mar 23 08:33:16 2012
@@ -217,13 +217,31 @@ $(function() {
                       dataType: 'json',
                       success: function(data) {
                         var treeEntries = mapTreeEntries(data);
-                        treeContentDiv.html($("#dependency_tree_tmpl" ).tmpl({treeEntries: treeEntries}));//[data[0]]
+                        treeContentDiv.html($("#dependency_tree_tmpl" ).tmpl({treeEntries: treeEntries}));
                       }
                     });
                   //}
                 }
                 if ($(e.target).attr("href")=="#artifact-details-used-by-content") {
-                  $.log("#artifact-details-used-by-content");
+                  var dependeesContentDiv=mainContent.find("#artifact-details-used-by-content" );
+                  //if( $.trim(dependeesContentDiv.html()).length<1){
+                    dependeesContentDiv.html(mediumSpinnerImg());
+                    var dependeesUrl="restServices/archivaServices/browseService/dependees/"+encodeURIComponent(groupId);
+                    dependeesUrl+="/"+encodeURIComponent(artifactId);
+                    dependeesUrl+="/"+encodeURIComponent(version);
+                    var selectedRepo=getSelectedBrowsingRepository();
+                    if (selectedRepo){
+                      dependeesUrl+="?repositoryId="+encodeURIComponent(selectedRepo);
+                    }
+                    $.ajax(dependeesUrl, {
+                      type: "GET",
+                      dataType: 'json',
+                      success: function(data) {
+                        var artifacts=mapArtifacts(data);
+                        dependeesContentDiv.html($("#dependees_tmpl" ).tmpl({artifacts: artifacts}));
+                      }
+                    });
+                  //}
                 }
 
               });

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1304228&r1=1304227&r2=1304228&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Fri Mar 23 08:33:16 2012
@@ -610,9 +610,7 @@
       <div id="artifact-details-dependency-tree-content" class="tab-pane">
       </div>
 
-      <div id="artifact-details-used-by-content" class="tab-pane">
-        used by
-      </div>
+      <div id="artifact-details-used-by-content" class="tab-pane"></div>
 
       <div id="artifact-details-mailing-list-content" class="tab-pane">
         {{if projectVersionMetadata.mailingLists && projectVersionMetadata.mailingLists.length>0}}
@@ -699,4 +697,27 @@
     {{/if}}
   {{/each}}
   </ul>
+</script>
+
+<script id="dependees_tmpl" type="text/html">
+    <ul>
+    {{each(i,artifact) artifacts}}
+      <li>
+          {{var entries=artifact.crumbEntries()}}
+          {{each(j,crumbEntry) entries}}
+            {{if j < entries.length - 2}}
+              <a href="#" onclick="generalDisplayGroup(encodeURIComponent('${crumbEntry.groupId}'))">${crumbEntry.displayValue}</a>
+            {{else j == entries.length - 2}}
+              <a href="#" onclick="generalDisplayArtifactDetailView(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'))">${crumbEntry.displayValue}</a>
+            {{else j == entries.length - 1}}
+              &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
+               <a href="#" onclick="generalDisplayArtifactVersionDetailViewModel(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'),encodeURIComponent('${crumbEntry.version}'))">${crumbEntry.version}</a>&nbsp;
+            {{/if}}
+            {{if j < entries.length - 2}}
+               &nbsp;/&nbsp;
+            {{/if}}
+          {{/each}}
+      </li>
+    {{/each}}
+    </ul>
 </script>
\ No newline at end of file