[webui] render the packages list with javascript from json array

openSUSE · Oct 11, 2012 · bab6a03 · bab6a03
1 parent 2012961
commit bab6a03
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 22 deletions.
diff --git a/src/activexml/transport.rb b/src/activexml/transport.rb
@@ -537,7 +537,7 @@ def http_do( method, url, opt={} )
 	     end
 	     payload[:all] = (Time.now - start) * 1000
              self.details.add(payload)
-             logger.debug "RT #{payload.inspect}"
+             logger.debug "RT #{url} #{payload.inspect}"
           end
         end
 

diff --git a/src/webui/app/assets/javascripts/application.js b/src/webui/app/assets/javascripts/application.js
@@ -23,6 +23,7 @@
 //= require bento/global-navigation.js
 //= require bento/l10n/global-navigation-data-en_US.js
 //= require package
+//= require project
 
 // toggle visibility of an element via the CSS "display" property
 // -> does NOT reserve the needed space for the element when not displayed

diff --git a/src/webui/app/assets/javascripts/project.js b/src/webui/app/assets/javascripts/project.js
@@ -0,0 +1,17 @@
+function renderPackagesTable(packages)
+{
+    var packageurl = $("#packages_table_wrapper").data("url");
+    $("#packages_table_wrapper").html( '<table cellpadding="0" cellspacing="0" border="0" class="display" id="packages_table"></table>' );
+    $("#packages_table").dataTable( {"aaData": packages, 
+				     "iDisplayLength": 10,
+				     "bSort": false,
+				     "bPaginate": packages.length > 12,
+				     "aoColumns": [
+					 {
+					     "fnRender": function ( obj ) {
+						 var url = packageurl.replace(/REPLACEIT/, obj.aData);
+						 return '<a href="' + url +'">' + obj.aData + '</a>';
+					     }
+					 } ]
+				    });
+}
diff --git a/src/webui/app/views/project/show.html.erb b/src/webui/app/views/project/show.html.erb
@@ -160,18 +160,15 @@
   <div class="grid_10 alpha box box-shadow">
     <h2 class="box-header">Packages (<%= @packages.length %>)</h2>
     <% if @packages.length > 0 %>
-      <table id="packages_table">
-        <thead>
-          <tr><th class="hidden">Name</th></tr>
-        </thead>
-        <tbody>
-          <% @packages.each do |package| %>
-            <tr>
-              <td><%= link_to(package, :controller => 'package', :action => 'show', :project => @project, :package => package) %></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
+       <div id="packages_table_wrapper" data-url="<%= url_for(:controller =>
+						  'package', :action => 'show', :project => @project, :package =>
+						  'REPLACEIT') %>">
+	<% content_for :ready_function do %> 
+	var packages = [ <%= @packages.map {|p| "['#{p}']"
+			     }.join(',').html_safe %> ];
+	renderPackagesTable(packages);
+	<% end %>
+       </div>
     <% else %>
       <p><i>This project does not contain any packages</i></p>
     <% end %>
@@ -193,12 +190,3 @@
   </div>
 <% end %>
 
-<% if @packages.length > 0 %>
-  <%= javascript_tag do %>
-    $(document).ready(function() {
-      $('#packages_table').dataTable({
-        "bSort": false,
-      });
-    });
-  <% end %>
-<% end %>