commit 30e46914ba4481c9d69a5c91387241c7f8cba4b7
author Clement Escoffier <clement@apache.org> Mon Jul 12 17:44:51 2010 +0000
committer Clement Escoffier <clement@apache.org> Mon Jul 12 17:44:51 2010 +0000
tree c62f4266b7d08bf7ec4acc9b44f086b3a24c1ddf
parent 6f594ddaed4e6ff9d125a3668ae5f1201f528eb4

Add filter in dependency requirements. (remove Id)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@963393 13f79535-47bb-0310-9956-ffa450edef68

ipojo/webconsole-plugin/src/main/resources/res/instance.html

diff --git a/ipojo/webconsole-plugin/src/main/resources/res/instance.html b/ipojo/webconsole-plugin/src/main/resources/res/instance.html
index 1b62a97..9748815 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/instance.html
+++ b/ipojo/webconsole-plugin/src/main/resources/res/instance.html
@@ -64,8 +64,8 @@
                     <thead>
                         <tr>
                             <th class="col_Name">Specification</th>
-                            <th class="col_Id">Id</th>
                             <th class="col_State">State</th>
+                            <th class="col_Filter">Filter</th>
                             <th class="col_Policy">Binding Policy</th>
                             <th class="col_Optional">Optional</th>
                             <th class="col_Aggregate">Aggregate</th>
@@ -76,8 +76,8 @@
                     <tbody>
                        <tr class="ui-widget-content"><!-- template -->
                             <td class="ui-widget-content name">&nbsp; </td>
-                            <td class="ui-widget-content id">&nbsp; </td>
                             <td class="ui-widget-content state">&nbsp;</td>
+                            <td class="ui-widget-content filter">&nbsp; </td>                        
                             <td class="ui-widget-content policy">&nbsp;</td>
                             <td class="ui-widget-content optional">&nbsp; </td>
                             <td class="ui-widget-content aggregate">&nbsp; </td>

ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js

diff --git a/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
index dc58708..af4e10e 100644
--- a/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
+++ b/ipojo/webconsole-plugin/src/main/resources/res/ui/instance_detail.js
@@ -79,7 +79,12 @@
             // For each service clone the template
             var entry = reqEntryTemplate.clone().appendTo(tableReqBody).attr('id', 'req-' + service.id);
             entry.find('td.name').text(service.specification);
-            entry.find('td.id').text(service.id);
+            if (service.filter) {
+                entry.find('td.filter').text(service.filter);    
+            } else {
+                entry.find('td.filter').html('<i>no filter</i>');
+            }
+            
             entry.find('td.state').text(service.state);
             
             entry.find('td.policy').text(service.policy);