Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Components/IO/BExIS.Io/IoHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public static string GetFileName(FileType type, long datasetId, int versionNr,

break;
case FileType.PrimaryDataFiles:
downloadName = string.Format("{0}_{1}_v{2}_data_{3}", appName, datasetId, versionOrTagLabel, title);
downloadName = string.Format("{0}_{1}_{2}_data_{3}", appName, datasetId, versionOrTagLabel, title);
break;
case FileType.Attachments:
downloadName = string.Format("{0}_{1}_{2}_attachment_{3}", appName, datasetId, versionOrTagLabel, title);
Expand Down
2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell.Svelte/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Console/BExIS.Web.Shell.Svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.74",
"@bexis2/bexis2-core-ui": "0.4.75",
"@sveltejs/adapter-static": "3.0.2",
"buffer": "6.0.3",
"gray-matter": "4.0.3",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.74",
"@bexis2/bexis2-core-ui": "0.4.75",
"@bexis2/bexis2-rpm-ui": "0.3.0",
"@floating-ui/dom": "1.6.8",
"@fortawesome/free-solid-svg-icons": "6.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
<button class="btn btn-sm variant-filled-secondary flex-none" on:click={editOldFn}
><Fa icon={faPen} /><span class="pl-1">Edit</span></button
>
<button class="btn btn-sm variant-filled-secondary flex-none" on:click={editFn}
<!-- <button class="btn btn-sm variant-filled-secondary flex-none" on:click={editFn}
><Fa icon={faPen} /><span class="pl-1">Edit (beta)</span></button
>
> -->
</div>
</div>
{#if open}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.74",
"@bexis2/bexis2-core-ui": "0.4.75",
"@floating-ui/dom": "1.6.8",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@sveltejs/adapter-static": "3.0.2",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.74",
"@bexis2/bexis2-core-ui": "0.4.75",
"@floating-ui/dom": "1.6.8",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@sveltejs/adapter-static": "3.0.2",
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"type": "module",
"dependencies": {
"@bexis2/bexis2-core-ui": "0.4.74",
"@bexis2/bexis2-core-ui": "0.4.75",
"@floating-ui/dom": "1.6.8",
"@fortawesome/free-solid-svg-icons": "6.6.0",
"@sveltejs/adapter-static": "3.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ public void CreateDataTypes(ref DataTable mappedDataTypes)
DataType dataType = new DataType();
// get existing dataTypes
DataType existDT = dataTypeManager.Repo.Get().Where(d =>
d.Name.Equals(dtName) &&
d.SystemType.ToString().Equals(mappedDataType["SystemType"].ToString())
d.Name.Equals(dtName)
).FirstOrDefault();
// return ID of existing dataType or create dataType
if (existDT == null && dtSystemType != null)
Expand All @@ -226,7 +225,10 @@ public void CreateDataTypes(ref DataTable mappedDataTypes)
}
else
{
existDT.Description = dtDescription;
existDT.SystemType = dtSystemType.ToString();
dataType = existDT;
dataTypeManager.Update(dataType);
}

mappedDataType["DataTypesId"] = dataType.Id;
Expand Down
2 changes: 1 addition & 1 deletion Console/Workspace
Loading