s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1888 from ostephens/fix-reconcile-facets

Browse Source 
Fix Reconcile facets affected by change to list facet boolean handling
This commit is contained in:
Jacky 2018-12-05 23:19:29 -05:00 committed by GitHub
commit eeb25797f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js
View File

@ -294,7 +294,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{
"name" : column.name + " "+$.i18n('core-views/hist-entries'),
"columnName" : column.name,
"expression" : "cell.recon.judgmentHistoryEntry"
"expression" : "cell.recon.judgmentHistoryEntry.toString()"
}
);
}
@ -326,7 +326,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{
"name" : column.name + ": "+$.i18n('core-views/best-cand-type-match'),
"columnName" : column.name,
"expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)"))'
"expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)")).toString()'
},
{
"scroll" : false
@ -343,7 +343,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{
"name" : column.name + ": "+ $.i18n('core-views/best-cand-name'),
"columnName" : column.name,
"expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), "(unreconciled)", "(blank)"))'
"expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), if(cell.recon.new,"(new)","(unreconciled)"), "(blank)")).toString()'
},
{
"scroll" : false