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/02/18 01:18:07 UTC

svn commit: r1245815 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/main.js archiva/search.js redback/users.js

Author: olamy
Date: Sat Feb 18 00:18:07 2012
New Revision: 1245815

URL: http://svn.apache.org/viewvc?rev=1245815&view=rev
Log:
repository browse accessible directly via queryparam: http://localhost:9091/archiva/index.html?request_lang=en&browse=org.apache.maven

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
    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/redback/users.js

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1245815&r1=1245814&r2=1245815&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Sat Feb 18 00:18:07 2012
@@ -162,6 +162,11 @@ $(function() {
     if (validateMeId) {
       validateKey(validateMeId);
     }
+
+    var browse = $.urlParam('browse');
+    if (browse){
+      displayBrowseGroupId(browse);
+    }
   });
 
   startArchivaApplication = function(){

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=1245815&r1=1245814&r2=1245815&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 Sat Feb 18 00:18:07 2012
@@ -57,9 +57,7 @@ $(function() {
 
   }
 
-  findParentGroupId=function(browseViewModel){
-    return browseViewModel.groupId;
-  }
+
 
   displayGroupDetail=function(groupId,parentBrowseViewModel,restUrl){
     var mainContent = $("#main-content");
@@ -108,6 +106,23 @@ $(function() {
     });
   }
 
+  /**
+   * called if browser url contains queryParam browse=groupId
+   * @param groupId
+   */
+  displayBrowseGroupId=function(groupId){
+    clearUserMessages();
+    var mainContent = $("#main-content");
+    mainContent.html($("#browse-tmpl" ).tmpl());
+    mainContent.find("#browse_result").html(mediumSpinnerImg());
+    var parentBrowseViewModel=new BrowseViewModel(null,null,null);
+    displayGroupDetail(groupId,parentBrowseViewModel,null)
+  }
+
+  function BrowseResultEntry(a, b){
+
+  }
+
   mapbrowseResultEntries=function(data){
     if (data.browseResult && data.browseResult.browseResultEntries) {
       return $.isArray(data.browseResult.browseResultEntries) ?

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js?rev=1245815&r1=1245814&r2=1245815&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/users.js Sat Feb 18 00:18:07 2012
@@ -287,23 +287,7 @@ $(function() {
     $("#users-view-tabs-li-user-edit").addClass("active");
   }
 
-  /**
-   * not used as we don't have the mapping in web.xml
-   * but why to handle such urls which go directly to a view
-   */
-  $(document).ready(function() {
-    // url ends with /users/list
-    // and current has archiva-manage-users karma
-    // so display users list
-    var pathContent = window.location.pathname.split("/");
-    var usersIndex = $.inArray("users", pathContent);
-    if (usersIndex>=0 && pathContent[usersIndex+1]=="list") {
-      if ($.inArray("archiva-manage-users",window.redbackModel.operatioNames)>=0){
-        displayUsersGrid();
-      }
-    }
 
-  });