Catalog seeding, blank-unique fix, slides rotation, console repair
This commit is contained in:
@@ -201,6 +201,7 @@ var
|
||||
// the check takes a few seconds, runs hidden, and gives no sign of life.
|
||||
CheckingPage: TOutputProgressWizardPage;
|
||||
PluginPage: TInputOptionWizardPage;
|
||||
CatalogPage: TInputOptionWizardPage;
|
||||
PluginNames: TArrayOfString;
|
||||
PluginPageReady: Boolean;
|
||||
DbPageReady: Boolean;
|
||||
@@ -397,7 +398,21 @@ begin
|
||||
if Trim(PluginNames[I]) <> '' then
|
||||
PluginPage.Add(PluginLabel(Trim(PluginNames[I])));
|
||||
|
||||
DbChoicePage := CreateInputOptionPage(PluginPage.ID,
|
||||
// Offered, not forced. A site that machines nothing inherits 21 machine types
|
||||
// it will never use, and a catalog nobody wanted is just clutter in every
|
||||
// dropdown. Ticked by default because the alternative is retyping a vendor and
|
||||
// model list another site already built.
|
||||
CatalogPage := CreateInputOptionPage(PluginPage.ID,
|
||||
'Starter data', 'Load the shared equipment catalog?',
|
||||
'Vendors, model numbers and the type lists, as built up across the other ' +
|
||||
'sites. It only ADDS - nothing existing is changed or removed - and it can ' +
|
||||
'be loaded later with "flask seed catalog". No assets, locations or people ' +
|
||||
'are included; this is catalogue information only.',
|
||||
False, False);
|
||||
CatalogPage.Add('Load the shared vendor and model catalog');
|
||||
CatalogPage.Values[0] := True;
|
||||
|
||||
DbChoicePage := CreateInputOptionPage(CatalogPage.ID,
|
||||
'Database', 'Where should ShopDB-Flask store its data?',
|
||||
'Most sites already run MySQL for the existing shopdb application. If so, ' +
|
||||
'choose the second option - installing a second server would collide on ' +
|
||||
@@ -1177,6 +1192,8 @@ begin
|
||||
' -OnFailure never' +
|
||||
' -ClientIpSource ' + ClientIpSourceArg +
|
||||
' -SitePlugins "' + SelectedPlugins + '"';
|
||||
if CatalogPage.Values[0] then
|
||||
Common := Common + ' -SeedCatalog';
|
||||
|
||||
// Subpath deployment: an IIS Application under the existing site instead of a
|
||||
// site of its own. Appended here because Pascal has no conditional expression.
|
||||
|
||||
Reference in New Issue
Block a user