svn commit: r1298147 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js

[olamy]

Author: olamy
Date: Wed Mar  7 22:00:39 2012
New Revision: 1298147

URL: http://svn.apache.org/viewvc?rev=1298147&view=rev
Log:
simplify code

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=1298147&r1=1298146&r2=1298147&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
 Wed Mar  7 22:00:39 2012
@@ -80,22 +80,30 @@ $(function() {
     }
 
     var screen = $.urlParam('screen');
-    $.log("screen:"+screen+',operations:'+window.redbackModel.operatioNames);
+
     if(screen){
-      if(screen=='proxy-connectors'&& 
$.inArray('archiva-manage-configuration',window.redbackModel.operatioNames)>=0){
+      if(screen=='proxy-connectors'&& 
hasKarma('archiva-manage-configuration')){
         displayProxyConnectors();
         return;
       }
-      if(screen=="legacy-artifact-path-support"&& 
$.inArray('archiva-manage-configuration',window.redbackModel.operatioNames)>=0){
+      if(screen=="legacy-artifact-path-support"&& 
hasKarma('archiva-manage-configuration')){
         displayLegacyArtifactPathSupport();
         return;
       }
+      if (screen=='repository-scanning'&& 
hasKarma('archiva-manage-configuration')){
+        displayRepositoryScanning();
+        return;
+      }
     }
 
     // by default display search screen
     displaySearch();
   }
 
+  hasKarma=function(karmaName){
+    return $.inArray(karmaName,window.redbackModel.operatioNames)>=0;
+  }
+
   decorateMenuWithKarma=function(user) {
     var username = user.username;
     $.log("decorateMenuWithKarma");