Skip to content

Commit

Permalink
honor attributesrecord also when separate column setup is given
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Wald committed May 21, 2018
1 parent d2fd44e commit a431955
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion BBjGridExWidget.bbj
Expand Up @@ -508,7 +508,9 @@ class public BBjGridExWidget extends BBjWidget
it! = r1!.getFieldNames().iterator()
while it!.hasNext()
f$ = it!.next()
r1!.setFieldAttributes(f$,ar!.getFieldAttributes(f$))
if ar!.contains(f$) then
r1!.setFieldAttributes(f$,ar!.getFieldAttributes(f$))
fi
wend
fi

Expand Down Expand Up @@ -1598,6 +1600,19 @@ class public BBjGridExWidget extends BBjWidget
declare DataRow cd!

cd! = #ColumnDefinition!

if #AttributesRecord! <> NULL() and cd! <> NULL() then
rem TODO: use the new method of components as soon as implemented
rem https://github.com/BasisHub/components/issues/87
ar! = #AttributesRecord!
it! = cd!.getFieldNames().iterator()
while it!.hasNext()
f$ = it!.next()
if cd!.contains(f$) then
cd!.setFieldAttributes(f$,ar!.getFieldAttributes(f$))
fi
wend
fi

if cd! = null() or cd!.getFieldNames().size()=0 then
if #RS! <> null() and #RS!.size()>0 then
Expand Down

0 comments on commit a431955

Please sign in to comment.