diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-07-15 15:37:48 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-07-15 15:37:48 -0500 |
| commit | cb06dcf5fa4d33519d84528088cdd8c7ae395f50 (patch) | |
| tree | c1894e501789408dcaea90d722799360c4e77ae7 | |
| parent | 1b577046bb0a4309c28b1ee42342626f7aa9797a (diff) | |
| download | bcfg2-cb06dcf5fa4d33519d84528088cdd8c7ae395f50.tar.gz bcfg2-cb06dcf5fa4d33519d84528088cdd8c7ae395f50.tar.bz2 bcfg2-cb06dcf5fa4d33519d84528088cdd8c7ae395f50.zip | |
Reporting: Fix prune items import and display
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Storage/DjangoORM.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Reporting/templates/config_items/item.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py index 2530d2b2b..0bb3111ae 100644 --- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py +++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py @@ -167,7 +167,7 @@ class DjangoORM(StorageBase): # TODO - vcs output act_dict['detail_type'] = PathEntry.DETAIL_UNUSED if path_type == 'directory' and entry.get('prune', 'false') == 'true': - unpruned_elist = [e.get('path') for e in entry.findall('Prune')] + unpruned_elist = [e.get('name') for e in entry.findall('Prune')] if unpruned_elist: act_dict['detail_type'] = PathEntry.DETAIL_PRUNED act_dict['details'] = "\n".join(unpruned_elist) diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html index b03d48045..c6e6df020 100644 --- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html +++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html @@ -107,7 +107,7 @@ div.entry_list h3 { {{ item.details|syntaxhilight }} </div> {% else %} - {{ item.details }} + {{ item.details|linebreaks }} {% endif %} </div> {% endif %} |