Fixed FELIX-3695 : When bundle filter doesn't match, the tool bars ar…

…e duplicated https://issues.apache.org/jira/browse/FELIX-3695 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1665413 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 10, 2015 · 7032d35 · 7032d35
1 parent 318c2cb
commit 7032d35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties b/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
@@ -150,6 +150,7 @@ bundles.filter.clear=Изчистване филтър
 bundles.filter.help=Низ или регулярен израз, който се съдържа в ID-то, името, символното име или версията на бъндъла.
 bundles.filter.ldap=Филтриране всичко
 bundles.filter.ldap.tip=Когато натиснете този бутон се прилага допълнително филтриране, спрямо *всички* хедъри на бундълите. Очаква се изразът в полето да бъде валиден OSGi LDAP филтър.
+bundles.filter.no_match=Няма бъндъли, които да отговарят на зададените критерии
 # states
 bundles.state.1=Деинсталиран
 bundles.state.2=Инсталиран

diff --git a/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties b/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -151,6 +151,7 @@ bundles.filter.clear=Clear Filter
 bundles.filter.help=A string or RegExp expression which is matched againse bundle id, name, symbolic name or version. In case 'Filter All' is used, the value must be a valid LDAP string.
 bundles.filter.ldap=Filter All
 bundles.filter.ldap.tip=When clicked, a server-side matching is performed agains *all* bundle manifest headers. The expression is expected to be a valid OSGi Filter
+bundles.filter.no_match=There are no bundles matching the current filter
 # states
 bundles.state.1=Uninstalled
 bundles.state.2=Installed

diff --git a/webconsole/src/main/resources/res/ui/bundles.js b/webconsole/src/main/resources/res/ui/bundles.js
@@ -64,6 +64,10 @@ function renderData( eventData, filter )  {
 	    bundlesTable.trigger('sorton', [cv]);
 	}
 
+	if (bundlesBody.find('tr').size() == 0) {
+		bundlesBody.html('<tr><td colspan="6">' + i18n.filterNoMatch + '</td></tr>');
+	}
+
 	// show dialog on error
 	if (eventData.error) bundleOpError.dialog('open').find('pre').text(eventData.error)
 }

diff --git a/webconsole/src/main/resources/templates/bundles.html b/webconsole/src/main/resources/templates/bundles.html
@@ -39,6 +39,7 @@
     statlineResolved      : '${bundles.statline.resolved}',
     statlineInstalled     : '${bundles.statline.installed}',
 	install_update        : '${bundles.install_or_update}',
+	filterNoMatch         : '${bundles.filter.no_match}',
 	state                 : {
 		1  : '${bundles.state.1}', // uninstalled
 		2  : '${bundles.state.2}', // installed