Merge "Update JS library"

diff --git a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java.rej b/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java.rej
deleted file mode 100644 (file)
index 7b03d34..0000000
--- a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java.rej
+++ /dev/null
@@ -1,85 +0,0 @@
-***************
-*** 29,35 ****
-  import org.opendaylight.controller.switchmanager.SwitchConfig;
-  import org.opendaylight.controller.usermanager.IUserManager;
-  import org.opendaylight.controller.web.IOneWeb;
-- import org.springframework.security.core.context.SecurityContextHolder;
-  import org.springframework.stereotype.Controller;
-  import org.springframework.web.bind.annotation.PathVariable;
-  import org.springframework.web.bind.annotation.RequestMapping;
---- 31,36 ----
-  import org.opendaylight.controller.switchmanager.SwitchConfig;
-  import org.opendaylight.controller.usermanager.IUserManager;
-  import org.opendaylight.controller.web.IOneWeb;
-  import org.springframework.stereotype.Controller;
-  import org.springframework.web.bind.annotation.PathVariable;
-  import org.springframework.web.bind.annotation.RequestMapping;
-***************
-*** 182,189 ****
-      @RequestMapping(value = "/flow", method = RequestMethod.POST)
-      @ResponseBody
-      public String actionFlow(@RequestParam(required = true) String action,
--             @RequestParam(required = false) String body, @RequestParam(required = true) String nodeId) {
--      if (!authorize(UserLevel.NETWORKADMIN)) {
-               return "Operation not authorized";
-       }
-       
---- 183,190 ----
-      @RequestMapping(value = "/flow", method = RequestMethod.POST)
-      @ResponseBody
-      public String actionFlow(@RequestParam(required = true) String action,
-+             @RequestParam(required = false) String body, @RequestParam(required = true) String nodeId, HttpServletRequest request) {
-+      if (!authorize(UserLevel.NETWORKADMIN, request)) {
-               return "Operation not authorized";
-       }
-       
-***************
-*** 206,213 ****
-      @RequestMapping(value = "/flow/{nodeId}/{name}", method = RequestMethod.POST)
-      @ResponseBody
-      public String removeFlow(@PathVariable("nodeId") String nodeId, @PathVariable("name") String name,
--              @RequestParam(required = true) String action) {
--      if (!authorize(UserLevel.NETWORKADMIN)) { return "Operation not authorized"; }
-       
-       IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
-                  .getInstance(IForwardingRulesManager.class, "default", this);
---- 207,214 ----
-      @RequestMapping(value = "/flow/{nodeId}/{name}", method = RequestMethod.POST)
-      @ResponseBody
-      public String removeFlow(@PathVariable("nodeId") String nodeId, @PathVariable("name") String name,
-+              @RequestParam(required = true) String action, HttpServletRequest request) {
-+      if (!authorize(UserLevel.NETWORKADMIN, request)) { return "Operation not authorized"; }
-       
-       IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
-                  .getInstance(IForwardingRulesManager.class, "default", this);
-***************
-*** 235,248 ****
-       * 
-       * @param level
-       */
--     private boolean authorize(UserLevel level) {
-       IUserManager userManager = (IUserManager) ServiceHelper
-                  .getGlobalInstance(IUserManager.class, this);
-          if (userManager == null) {
-               return false;
-          }
-          
--         String username = SecurityContextHolder.getContext().getAuthentication().getName();
-          UserLevel userLevel = userManager.getUserLevel(username);
-          if (userLevel.toNumber() <= level.toNumber()) {
-               return true;
---- 236,249 ----
-       * 
-       * @param level
-       */
-+     private boolean authorize(UserLevel level, HttpServletRequest request) {
-       IUserManager userManager = (IUserManager) ServiceHelper
-                  .getGlobalInstance(IUserManager.class, this);
-          if (userManager == null) {
-               return false;
-          }
-          
-+         String username = request.getUserPrincipal().getName();
-          UserLevel userLevel = userManager.getUserLevel(username);
-          if (userLevel.toNumber() <= level.toNumber()) {
-               return true;

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
index a3d9dcff638cfba6318b0c59e7cba22551af2b7a..863b0a64a04b6e2f32abfaf50bc78adf7965236b 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/main.jsp
@@ -56,12 +56,12 @@
  <!-- #menu -->
  <div id="menu" class="navbar navbar-fixed-top">
   <div class="navbar-inner row-fluid">
-   <div class="span10">
+   <div class="span9">
     <a class="brand" href="/" title="${version}">${name}</a>
     <ul class="nav nav-tabs">
     </ul>
    </div>
-   <div class="span2">
+   <div class="span3">
     <div id="toolbar" class="btn-group">
      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
       <div class="icon-user"></div> ${username} <span class="caret"></span>
@@ -189,4 +189,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

diff --git a/opendaylight/web/root/src/main/resources/js/lib.js b/opendaylight/web/root/src/main/resources/js/lib.js
index 81188571644552e6159aeca5b4cec813d0eda1bd..6b73668ab885d3c351e2bfcf15622710555381d8 100644 (file)
--- a/opendaylight/web/root/src/main/resources/js/lib.js
+++ b/opendaylight/web/root/src/main/resources/js/lib.js
@@ -95,9 +95,9 @@ one.lib.dashlet = {
             if (body.length == 0 && !(typeof thead === 'undefined')) {
                 var $tr = $(document.createElement('tr'));
                 var $td = $(document.createElement('td'));
-                $td.attr("colspan", thead.length);
-                $td.text("No data available");
-                $td.addClass("empty");
+                $td.attr('colspan', thead.length);
+                $td.text('No data available');
+                $td.addClass('empty');
                 $tr.append($td);
                 $tbody.append($tr);
                 return $tbody;
@@ -105,21 +105,25 @@ one.lib.dashlet = {
             // else, populate as usual
             $(body).each(function(index, value) {
                 var $tr = $(document.createElement('tr'));
-                // data-id
-                if (value['id'] != undefined) {
-                    $tr.attr('data-id', value['id']);
-                }
-                // add classes
-                $(value["type"]).each(function(index, value) {
-                    $tr.addClass(value);
-                });
-                // add entries
-                $(value["entry"]).each(function(index, value) {
-                    var $td = $(document.createElement('td'));
-                    $td.append(value);
-                    $tr.append($td);
+                $.each(value, function(key, value) {
+                    if (key == 'type') {
+                        // add classes
+                        $(value).each(function(index, value) {
+                            $tr.addClass(value);
+                        });
+                    } else if (key == 'entry') {
+                        // add entries
+                        $(value).each(function(index, value) {
+                            var $td = $(document.createElement('td'));
+                            $td.append(value);
+                            $tr.append($td);
+                        });
+                    } else {
+                        // data field
+                        $tr.attr('data-' + key, value);
+                    }
+                    $tbody.append($tr);
                 });
-                $tbody.append($tr);
             });
             return $tbody;
         }
@@ -279,4 +283,4 @@ one.lib.alert = function(alert) {
     one.lib.registry.alert = setTimeout(function() {
         $("#alert").slideUp();
     }, 8000);
-}
\ No newline at end of file
+}