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/07/10 19:23:28 UTC
svn commit: r1359797 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Author: olamy
Date: Tue Jul 10 17:23:27 2012
New Revision: 1359797
URL: http://svn.apache.org/viewvc?rev=1359797&view=rev
Log:
remove manual url handling sammy do that better :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.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=1359797&r1=1359796&r2=1359797&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 Tue Jul 10 17:23:27 2012
@@ -91,67 +91,6 @@ function() {
}
}
}
-
-
- var screen = $.urlParam('screen');
-
- if(screen){
- if(screen=='network-proxies'&& hasKarma('archiva-manage-configuration')){
- displayNetworkProxies();
- return;
- }
- if(screen=='proxy-connectors'&& hasKarma('archiva-manage-configuration')){
- displayProxyConnectors();
- return;
- }
- if(screen=="legacy-artifact-path-support"&& hasKarma('archiva-manage-configuration')){
- displayLegacyArtifactPathSupport();
- return;
- }
- if (screen=='repository-scanning'&& hasKarma('archiva-manage-configuration')){
- displayRepositoryScanning();
- return;
- }
- if (screen=='network-configuration'&& hasKarma('archiva-manage-configuration')){
- displayNetworkConfiguration();
- return;
- }
- if (screen=='system-status'&& hasKarma('archiva-manage-configuration')){
- displaySystemStatus();
- return;
- }
- if (screen=='repositories-management'&& hasKarma('archiva-manage-configuration')){
- displayRepositoriesGrid();
- return;
- }
- if (screen=='ui-configuration'&& hasKarma('archiva-manage-configuration')){
- displayUiConfiguration();
- return;
- }
-
- if (screen=="browse"){
- displayBrowse(true);
- return;
- }
- if (screen=='appearance-configuration'&& hasKarma('archiva-manage-configuration')){
- displayAppearanceConfiguration();
- return;
- }
-
- if (screen=='artifact-upload' && hasKarma('archiva-upload-repository')){
- displayUploadArtifact();
- return;
- }
-
- if (screen=='manage-users' && hasKarma('archiva-manage-users')){
- displayUsersGrid();
- return;
- }
- if (screen=='roles-grid' && hasKarma('archiva-manage-users')){
- displayRolesGrid();
- return;
- }
- }
// by default display search screen
displaySearch();
}
@@ -328,7 +267,7 @@ function() {
ko.utils.arrayFirst(self.artifactMenuItems.concat(self.usersMenuItems, self.administrationMenuItems), function(p) {
if ( p.href == "#"+self.activeMenuId()) {
p.func();
- }
+ }
});
});