[felix-dev] branch master updated: FELIX-6040 expose PID in ConfigMgr WebConsole (#103)

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new be95e83  FELIX-6040 expose PID in ConfigMgr WebConsole (#103)
be95e83 is described below

commit be95e83c40f37d1d84e525fc68647b33a5f90489
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Tue Oct 19 10:18:46 2021 +0200

    FELIX-6040 expose PID in ConfigMgr WebConsole (#103)
    
    allows to disambiguate multiple designates pointing to the same OCD
---
 webconsole/src/main/resources/res/ui/config.css | 9 +++++++++
 webconsole/src/main/resources/res/ui/config.js  | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/webconsole/src/main/resources/res/ui/config.css 
b/webconsole/src/main/resources/res/ui/config.css
index 141fa85..05b0a7a 100644
--- a/webconsole/src/main/resources/res/ui/config.css
+++ b/webconsole/src/main/resources/res/ui/config.css
@@ -67,4 +67,13 @@ input.placeholder-active { color: #AAA !important }
 
 .iconMarginTop {
        margin-top: .25em;
+}
+.pid { 
+       font-style: italic 
+}
+.pid:before { 
+       content: " (" 
+}
+.pid:after { 
+       content: ")"
 }
\ No newline at end of file
diff --git a/webconsole/src/main/resources/res/ui/config.js 
b/webconsole/src/main/resources/res/ui/config.js
index 4634d62..a26113a 100644
--- a/webconsole/src/main/resources/res/ui/config.js
+++ b/webconsole/src/main/resources/res/ui/config.js
@@ -557,7 +557,8 @@ function addConfig(conf) {
         }
                tr.attr('fpid', conf.name);
        } else {
-               nms.addClass('ui-helper-hidden').parent().text(conf.name);
+               var name = escapeHtml(conf.name) + '<span class="pid">' + 
conf.id + '</span>';
+               nms.addClass('ui-helper-hidden').parent().html(name);
        }
 
        tr.find('td:eq(1)').click(function() { // name & edit