Skip to content

Commit 7b14d15

Browse files
committed
Make sure the Customers master table is opened
1 parent 5db815c commit 7b14d15

2 files changed

Lines changed: 4 additions & 50 deletions

File tree

demos/FireMonkey/Database/Master_Detail_FireDAC/Master_Detail_FireDAC.fmx

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,7 @@ object MasterDetail: TMasterDetail
1111
OnCreate = FormCreate
1212
DesignerMasterStyle = 0
1313
object TeeGrid1: TTeeGrid
14-
Columns = <
15-
item
16-
Format.Font.Style = [fsBold]
17-
Header.Text = 'CustomerID'
18-
ParentFormat = False
19-
Link = 'CustomerID'
20-
end
21-
item
22-
Header.Text = 'CompanyName'
23-
Link = 'CompanyName'
24-
end
25-
item
26-
Header.Text = 'ContactName'
27-
Link = 'ContactName'
28-
end
29-
item
30-
Header.Text = 'ContactTitle'
31-
Link = 'ContactTitle'
32-
end
33-
item
34-
Header.Text = 'Address'
35-
Link = 'Address'
36-
end
37-
item
38-
Header.Text = 'City'
39-
Link = 'City'
40-
end
41-
item
42-
Header.Text = 'Region'
43-
Link = 'Region'
44-
end
45-
item
46-
Header.Text = 'PostalCode'
47-
Link = 'PostalCode'
48-
end
49-
item
50-
Header.Text = 'Country'
51-
Link = 'Country'
52-
end
53-
item
54-
Header.Text = 'Phone'
55-
Link = 'Phone'
56-
end
57-
item
58-
Header.Text = 'Fax'
59-
Link = 'Fax'
60-
end>
14+
Columns = <>
6115
Align = Client
6216
Size.Width = 817.000000000000000000
6317
Size.Height = 554.000000000000000000

demos/FireMonkey/Database/Master_Detail_FireDAC/Master_Detail_FireDAC.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ implementation
6161

6262
procedure TMasterDetail.FormCreate(Sender: TObject);
6363
begin
64+
SampleData.CustomersTable.Open;
65+
6466
TeeGrid1.DataSource:=SampleData.CustomersTable;
6567

6668
Open := False;
@@ -75,8 +77,7 @@ procedure TMasterDetail.FormCreate(Sender: TObject);
7577
// Optional. Called when a new detail sub-grid has been created
7678
procedure TMasterDetail.Button1Click(Sender: TObject);
7779
begin
78-
79-
if Open = True then
80+
if Open then
8081
Begin
8182
TeeGrid1.Grid.Current.ShowHideAllDetail(0,False);
8283
Open:= False;
@@ -86,7 +87,6 @@ procedure TMasterDetail.Button1Click(Sender: TObject);
8687
TeeGrid1.Grid.Current.ShowHideAllDetail(0,True);
8788
Open:= True;
8889
End;
89-
9090
end;
9191

9292
procedure TMasterDetail.CBEnabledChange(Sender: TObject);

0 commit comments

Comments
 (0)