Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
rmunn committed Oct 15, 2024
1 parent 21d089e commit 59733e0
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 14 deletions.
2 changes: 0 additions & 2 deletions backend/LexBoxApi/GraphQL/ProjectMutations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ public async Task<IQueryable<Project>> UpdateFLExModelVersion(string code,
{
var projectId = await projectService.LookupProjectId(code);
await permissionService.AssertCanManageProject(projectId);
var project = await dbContext.Projects.FindAsync(projectId);
NotFoundException.ThrowIfNull(project);
await projectService.UpdateFLExModelVersion(projectId);
return dbContext.Projects.Where(p => p.Id == projectId);
}
Expand Down
12 changes: 2 additions & 10 deletions backend/LexBoxApi/Services/HgService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,16 +271,8 @@ private string[] GetWsList(System.Xml.XmlElement root, string tagName)
{
var result = await ExecuteHgCommandServerCommand(code, "flexmodelversion", token);
var text = await result.ReadAsStringAsync(token);
try
{
var json = JsonDocument.Parse(text);
return json.RootElement.GetProperty("modelversion").GetInt32();
}
catch
{
if (int.TryParse(text, out var num)) return num;
}
return null;
var json = JsonDocument.Parse(text);
return json.RootElement.GetProperty("modelversion").GetInt32();
}

public Task RevertRepo(ProjectCode code, string revHash)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
$: fwModel = versionLookupTable[modelVersion] ?? 'Unknown FieldWorks version';
</script>

<span class={extraClass}>{fwModel}</span>
<span title="FLEx data model {modelVersion}" class={extraClass}>{fwModel}</span>
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@
</AdminContent>
</DetailItem>
{/if}
<!-- Only show model version to project managers and admins, too technical to show to regular members -->
{#if project.type === ProjectType.FlEx}
<DetailItem title={$t('project_page.model_version')}>
<FlexModelVersionText modelVersion={flexModelVersion ?? 0} />
Expand Down

0 comments on commit 59733e0

Please sign in to comment.