Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deployment version label #1176

Merged
merged 2 commits into from
Dec 16, 2022
Merged

Deployment version label #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d0f56
FIX: Current deployment version was changed in the model browser even…
JindrichSusen Dec 15, 2022
e96b040
FIX: Architect title was not updated after deployment script was exec…
JindrichSusen Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backend/Origam.Gui.Win/Commands/MakeActiveVersionCurrent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public override void Run()
MakeVersionCurrent cmd = new MakeVersionCurrent();
cmd.Owner = Owner as DeploymentVersion;
cmd.Run();
WorkbenchSingleton.Workbench.UpdateTitle();
}

public override void Dispose()
Expand Down
5 changes: 3 additions & 2 deletions backend/Origam.Gui.Win/Commands/MakeVersionCurrent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@ public override void Run()

Package ext = _persistence.SchemaProvider.RetrieveInstance(typeof(Package), _schemaService.ActiveExtension.PrimaryKey) as Package;

Origam.Workbench.Commands.DeployVersion cmd3 = new Origam.Workbench.Commands.DeployVersion();
washibana marked this conversation as resolved.
Show resolved Hide resolved
cmd3.Run();

ext.VersionString = version.VersionString;
ext.Persist();
_schemaService.ActiveExtension.Refresh();
_schemaService.SchemaBrowser.EbrSchemaBrowser.RefreshItem(version.RootProvider);
_schemaService.SchemaBrowser.EbrSchemaBrowser.SelectItem(version);
Origam.Workbench.Commands.DeployVersion cmd3 = new Origam.Workbench.Commands.DeployVersion();
cmd3.Run();
}
}
}
3 changes: 2 additions & 1 deletion backend/Origam.UI.Common.NetFx/IWorkbench.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,6 @@ IViewContent ActiveDocument
bool PopulateEmptyDatabaseOnLoad { get; set; }

void OpenForm(object owner,Hashtable parameters);
}
void UpdateTitle();
}
}
16 changes: 8 additions & 8 deletions backend/OrigamArchitect/ArchitectWorkbench.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,8 +1462,8 @@ public void Connect(string configurationName)
// Init services
InitializeConnectedServices();

// Initialize model-connected user interface
InitializeConnectedPads();
// Initialize model-connected user interface
InitializeConnectedPads();
CreateMainMenuConnect();
IsConnected = true;
#if !ORIGAM_CLIENT
Expand Down Expand Up @@ -1503,7 +1503,7 @@ public void Connect(string configurationName)
#endif
this.LoadWorkspace();
cmd.Run();
}
}

private void SubscribeToUpgradeServiceEvents()
{
Expand Down Expand Up @@ -1709,7 +1709,7 @@ public bool Disconnect()

UpdateTitle();

modelCheckCancellationTokenSource.Cancel();
modelCheckCancellationTokenSource.Cancel();
modelCheckCancellationTokenSource =
new CancellationTokenSource();
return true;
Expand Down Expand Up @@ -2066,9 +2066,9 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
return base.ProcessCmdKey(ref msg, keyData);
}

private void _schema_SchemaLoaded(object sender, EventArgs e)
private void _schema_SchemaLoaded(object sender, EventArgs e)
{
OrigamEngine.InitializeSchemaItemProviders(_schema);
OrigamEngine.InitializeSchemaItemProviders(_schema);
IDeploymentService deployment
= ServiceManager.Services.GetService<IDeploymentService>();
IParameterService parameterService
Expand Down Expand Up @@ -2177,7 +2177,7 @@ IParameterService parameterService
UpdateTitle();
}

private void UpdateTitle()
public void UpdateTitle()
{
#if ORIGAM_CLIENT
Title = "";
Expand Down Expand Up @@ -2269,7 +2269,7 @@ public void ExitWorkbench()
private void _schema_SchemaUnloading(object sender, CancelEventArgs e)
{
e.Cancel = ! UnloadSchema();
}
}

private void CheckModelRootPackageVersion()
{
Expand Down