Changeset 40 for trunk/Forms/UItemView.pas

Timestamp:

Mar 9, 2012, 8:11:13 AM (13 years ago)

Author:

chronos

Message:

• Added: Remember last password in login dialog.
• Fixed: Some Add, Edit, View, Select dialog display.

File:

• trunk/Forms/UItemView.pas (modified) (3 diffs)

trunk/Forms/UItemView.pas

@@ -56 +56 @@
 {$R *.lfm}
 
+resourcestring
+  SExpectedOneRow = 'Expected one row';
+
 { TItemViewForm }
 
@@ -106 +109 @@
   NewItemEditForm: TItemEditForm;
 begin
-  Close;
-  NewItemEditForm := TItemEditForm.Create(nil);
-  NewItemEditForm.SelectedObject.Assign(SelectedObject);
-  NewItemEditForm.SelectedItemId := SelectedItemId;
-  NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
-  MainForm.SetMainPanelForm(NewItemEditForm);
+  try
+    NewItemEditForm := TItemEditForm.Create(nil);
+    NewItemEditForm.SelectedObject.Assign(SelectedObject);
+    NewItemEditForm.SelectedItemId := SelectedItemId;
+    NewItemEditForm.Caption := NewItemEditForm.Caption + ' ' + SelectedObject.Name;
+    NewItemEditForm.ShowModal;
+  finally
+    NewItemEditForm.Free;
+  end;
 end;
 
@@ -156 +162 @@
   // Load column names
 
-  if Report.Count = 1 then
+  if Report.Count > 1 then raise Exception.Create(SExpectedOneRow);
+  if Report.Count > 0 then
   for I := 0 to Report.Columns.Count - 1 do begin
     DataType := TReportColumn(Report.Columns[I]).CustomType;