Author: vvalchev
Date: Tue Mar 10 08:35:19 2015
New Revision: 1665413
URL: http://svn.apache.org/r1665413
Log:
Fixed FELIX-3695 : When bundle filter doesn't match, the tool bars are
duplicated
https://issues.apache.org/jira/browse/FELIX-3695
Modified:
felix/trunk/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
felix/trunk/webconsole/src/main/resources/templates/bundles.html
Modified:
felix/trunk/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties?rev=1665413&r1=1665412&r2=1665413&view=diff
==============================================================================
---
felix/trunk/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
[UTF-8] (original)
+++
felix/trunk/webconsole-l10n/bg/src/main/resources/OSGI-INF/l10n/bundle_bg.properties
[UTF-8] Tue Mar 10 08:35:19 2015
@@ -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=Инсталиран
Modified:
felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties?rev=1665413&r1=1665412&r2=1665413&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
(original)
+++ felix/trunk/webconsole/src/main/resources/OSGI-INF/l10n/bundle.properties
Tue Mar 10 08:35:19 2015
@@ -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
Modified: felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/res/ui/bundles.js?rev=1665413&r1=1665412&r2=1665413&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/res/ui/bundles.js (original)
+++ felix/trunk/webconsole/src/main/resources/res/ui/bundles.js Tue Mar 10
08:35:19 2015
@@ -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)
}
Modified: felix/trunk/webconsole/src/main/resources/templates/bundles.html
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/resources/templates/bundles.html?rev=1665413&r1=1665412&r2=1665413&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8]
(original)
+++ felix/trunk/webconsole/src/main/resources/templates/bundles.html [UTF-8]
Tue Mar 10 08:35:19 2015
@@ -39,6 +39,7 @@ var i18n = {
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
