Skip to content

Commit 64ea555

Browse files
sventhielsventhiel
committed
Merge branch 'rc' of https://github.com/bexis2/core into rc
2 parents 3635e90 + f49f9fe commit 64ea555

File tree

8 files changed

+185
-16
lines changed

8 files changed

+185
-16
lines changed

‎Components/IO/BExIS.Io/IoHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static string GetFileName(FileType type, long datasetId, int versionNr, l
6060
downloadName = string.Format("{0}_{1}_v{2}_metadata_{3}", appName, datasetId, versionNr, title);
6161
break;
6262
case FileType.DataStructure:
63-
downloadName = string.Format("{0}_{1}_datastructure_{2}", appName, datasetId, datastructureId);
63+
downloadName = string.Format("{0}_{1}_data_structure_{2}", appName, datasetId, datastructureId);
6464
break;
6565
case FileType.PrimaryData:
6666
downloadName = string.Format("{0}_{1}_v{2}_data", appName, datasetId, versionNr);

‎Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI.Svelte/src/routes/entitytemplates/Edit.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// ui Components
77
import Fa from 'svelte-fa';
88
import { DropdownKVP, MultiSelect, TextArea, TextInput, Spinner } from '@bexis2/bexis2-core-ui';
9-
import { faSave, faTrash } from '@fortawesome/free-solid-svg-icons/index';
9+
import { faSave, faXmark } from '@fortawesome/free-solid-svg-icons/index';
1010
import { SlideToggle } from '@skeletonlabs/skeleton';
1111
import ContentContainer from '../../lib/components/ContentContainer.svelte';
1212
import { Modal, getModalStore } from '@skeletonlabs/skeleton';
@@ -400,7 +400,7 @@
400400
title="cancel"
401401
type="button"
402402
class="btn variant-filled-warning"
403-
on:click={onCancel}><Fa icon={faTrash} /></button
403+
on:click={onCancel}><Fa icon={faXmark} /></button
404404
>
405405
<button title="save" type="submit" class="btn variant-filled-primary" {disabled}
406406
><Fa icon={faSave} /></button

‎Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/src/lib/components/datastructure/structure/variable/Variable.svelte‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ import { faTable } from '@fortawesome/free-solid-svg-icons';
335335
function test() {
336336
console.log('close template model');
337337
openTemplateModel = false;
338+
338339
}
339340
340341
</script>
@@ -645,5 +646,6 @@ import { faTable } from '@fortawesome/free-solid-svg-icons';
645646
</div>
646647

647648
{#if openTemplateModel}
649+
648650
<VariableTemplateSelection bind:list={variableTemplates} on:selected={selectVariableTamplateFn} on:close{test}/>
649651
{/if}

‎Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI.Svelte/src/lib/components/datastructure/structure/variable/VariableTemplateSelection.svelte‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ function select(type: any) {
2626
2727
function open(): void {
2828
29-
const drawerSettings: DrawerSettings = {
30-
id: 'example-2',
31-
meta: { foo: 'bar', fizz: 'buzz', age: 40 }
32-
};
33-
drawerStore.open(drawerSettings);
34-
}
29+
if(list==undefined || list.length==0){
30+
return;
31+
}
32+
33+
const drawerSettings: DrawerSettings = {
34+
id: 'example-2',
35+
meta: { foo: 'bar', fizz: 'buzz', age: 40 }
36+
};
37+
drawerStore.open(drawerSettings);
38+
}
3539
3640
function close() {
3741
console.log('close selection');
3842
dispatch('close');
3943
drawerStore.close();
44+
45+
list = [];
4046
4147
}
4248

‎Console/BExIS.Web.Shell/Areas/RPM/BExIS.Modules.Rpm.UI/Helpers/MeaningHelper.cs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ public static Meaning ConvertTo(MeaningModel model)
6060

6161
if (model.ExternalLinks != null && model.ExternalLinks.Any())
6262
{
63-
model.ExternalLinks.ToList().ForEach(x => meaning.ExternalLinks.Add(ConvertTo(x)));
63+
foreach (MeaningEntryModel l in model.ExternalLinks)
64+
{
65+
if (l.MappingRelation.Id > 0) // add only if there is a selected mapping relation
66+
{
67+
meaning.ExternalLinks.Add(ConvertTo(l));
68+
}
69+
}
70+
6471
}
6572

6673
if (model.Constraints != null && model.Constraints.Any())
@@ -82,13 +89,15 @@ public static MeaningEntry ConvertTo(MeaningEntryModel model)
8289
using (var meaningManager = new MeaningManager())
8390
{
8491
if (model.MappingRelation != null)
92+
{
8593
entry.MappingRelation = meaningManager.GetExternalLink(model.MappingRelation.Id);
8694

87-
if (model.MappedLinks.Any())
88-
{
89-
var ids = model.MappedLinks.Select(m => m.Id);
95+
if (model.MappedLinks.Any())
96+
{
97+
var ids = model.MappedLinks.Select(m => m.Id);
9098

91-
entry.MappedLinks = meaningManager.GetExternalLinks().Where(e => ids.Contains(e.Id)).ToList();
99+
entry.MappedLinks = meaningManager.GetExternalLinks().Where(e => ids.Contains(e.Id)).ToList();
100+
}
92101
}
93102
}
94103
return entry;

‎Console/BExIS.Web.Shell/Areas/SAM/BExIS.Modules.Sam.UI/Views/UserPermissions/_Subjects.cshtml‎

Lines changed: 140 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,143 @@
5555
.ClientEvents(events =>
5656
{
5757
events.OnDataBound("grid_subjects_onDataBound");
58-
}))
58+
}))
59+
60+
61+
62+
@section Scripts
63+
{
64+
<script src="@Url.Content("~/Scripts/2013.2.611/telerik.common.min.js")" type="text/javascript"></script>
65+
<script src="@Url.Content("~/Scripts/2013.2.611/telerik.draganddrop.min.js")" type="text/javascript"></script>
66+
<script src="@Url.Content("~/Scripts/2013.2.611/telerik.window.min.js")" type="text/javascript"></script>
67+
68+
<script type="text/javascript">
69+
70+
$("#treeView_entities li div")
71+
.click(function(e) {
72+
$(e.target).find(".t-in").trigger("click");
73+
});
74+
75+
function getTreeView() {
76+
return $('#treeView_entities').data('tTreeView');
77+
}
78+
79+
function treeView_entities_onSelect(e) {
80+
var entityId = getTreeView().getItemValue(e.item);
81+
var prevSelectedDiv = $(".bx-selected");
82+
if (prevSelectedDiv.length > 0) $(prevSelectedDiv).removeClass("bx-selected");
83+
84+
var selectedDiv = $(e.item).find("div")[0];
85+
$(selectedDiv).addClass("bx-selected");
86+
87+
$('#content_instances').empty();
88+
89+
$.get('@Url.Action("Instances", "EntityPermissions")',
90+
{ EntityId: entityId },
91+
function(contentData) {
92+
93+
$('#content_instances').html(contentData);
94+
95+
truncateTitle();
96+
});
97+
}
98+
99+
function grid_instances_onDataBound() {
100+
addTooltips();
101+
resetAllTelerikIconTitles();
102+
103+
$("#grid_instances")
104+
.on("change",
105+
"input[name='selectedInstances']:checkbox",
106+
function(e) {
107+
if ($(this).is(':checked')) {
108+
$.post('@Url.Action("AddInstanceToPublic", "EntityPermissions")',
109+
{ EntityId: $(this).data('entityid'), InstanceId: $(this).data('instanceid') },
110+
function() {
111+
$("#grid_subjects .t-refresh").trigger('click');
112+
$("#grid_instances .t-refresh").trigger('click');
113+
});
114+
} else {
115+
$.post('@Url.Action("RemoveInstanceFromPublic", "EntityPermissions")',
116+
{ EntityId: $(this).data('entityid'), InstanceId: $(this).data('instanceid') },
117+
function() {
118+
$("#grid_subjects .t-refresh").trigger('click');
119+
$("#grid_instances .t-refresh").trigger('click');
120+
});
121+
}
122+
});
123+
}
124+
125+
function grid_instances_onRowSelect(e) {
126+
$.get('@Url.Action("Subjects", "EntityPermissions")',
127+
{
128+
EntityId: $("input[name='selectedInstances']:checkbox", e.row).data('entityid'),
129+
InstanceId: $("input[name='selectedInstances']:checkbox", e.row).data('instanceid')
130+
},
131+
function(data) {
132+
$('#content_subjects').empty();
133+
$('#content_subjects').html(data);
134+
});
135+
}
136+
137+
function grid_subjects_onDataBound() {
138+
addTooltips();
139+
resetAllTelerikIconTitles();
140+
141+
$("#grid_subjects tbody input:checkbox").click(function () {
142+
if ($(this).is(':checked')) {
143+
$.post('@Url.Action("AddRightToEntityPermission", "EntityPermissions")',
144+
{ SubjectId: $(this).data('subjectid'), EntityId: $(this).data('entityid'), InstanceId: $(this).data('instanceid'), RightType: $(this).data('righttype') },
145+
function () {
146+
$("#grid_subjects .t-refresh").trigger('click');
147+
});
148+
} else {
149+
$.post('@Url.Action("RemoveRightFromEntityPermission", "EntityPermissions")',
150+
{ SubjectId: $(this).data('subjectid'), EntityId: $(this).data('entityid'), InstanceId: $(this).data('instanceid'), RightType: $(this).data('righttype') },
151+
function () {
152+
$("#grid_subjects .t-refresh").trigger('click');
153+
});
154+
}
155+
});
156+
}
157+
158+
function grid_subjects_onRowSelect(e) {
159+
console.log(e.row);
160+
$.ajax({
161+
type: 'GET',
162+
url: '@Url.Action("Permissions", "EntityPermissions")',
163+
data: { SubjectId: $("input", e.row).data('subjectid'), EntityId: $("input", e.row).data('entityid'), InstanceId: $("input", e.row).data('instanceid') },
164+
dataType: 'html',
165+
success: function(htmlData) {
166+
var windowElement = $.telerik.window.create({
167+
title: "Permissions: " + $("input", e.row).data('title'),
168+
html: "<div id='content_permissions' class='bx-window'>" + htmlData + "</div>",
169+
contentUrl: "",
170+
actions: ["Close"],
171+
modal: true,
172+
width: 500,
173+
height: 500,
174+
resizable: false,
175+
draggable: true,
176+
scrollable: false,
177+
onClose: function() {
178+
$("#window_permissions").data('tWindow').destroy();
179+
$("#grid_subjects .t-refresh").trigger('click');
180+
}
181+
});
182+
183+
windowElement.attr('id', 'window_permissions');
184+
var window = $(windowElement).data('tWindow');
185+
window.center().open();
186+
187+
resetAllTelerikIconTitles();
188+
}
189+
});
190+
}
191+
192+
function grid_permissions_onDataBound() {
193+
addTooltips();
194+
resetAllTelerikIconTitles();
195+
}
196+
</script>
197+
}

‎Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/vite.config.ts.timestamp-1762786519580-d473b126c584f.mjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// vite.config.ts
2+
import { sveltekit } from "file:///C:/Users/David%20Sch%C3%B6ne/source/repos/BEXIS2/BEXIS2-RC/Core/Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/node_modules/@sveltejs/kit/src/exports/vite/index.js";
3+
import { defineConfig } from "file:///C:/Users/David%20Sch%C3%B6ne/source/repos/BEXIS2/BEXIS2-RC/Core/Console/BExIS.Web.Shell/Areas/SMM/BExIS.Modules.SMM.UI.Svelte/node_modules/vitest/dist/config.js";
4+
var vite_config_default = defineConfig({
5+
plugins: [sveltekit()],
6+
test: {
7+
include: ["src/**/*.{test,spec}.{js,ts}"]
8+
}
9+
});
10+
export {
11+
vite_config_default as default
12+
};
13+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJDOlxcXFxVc2Vyc1xcXFxEYXZpZCBTY2hcdTAwRjZuZVxcXFxzb3VyY2VcXFxccmVwb3NcXFxcQkVYSVMyXFxcXEJFWElTMi1SQ1xcXFxDb3JlXFxcXENvbnNvbGVcXFxcQkV4SVMuV2ViLlNoZWxsXFxcXEFyZWFzXFxcXFNNTVxcXFxCRXhJUy5Nb2R1bGVzLlNNTS5VSS5TdmVsdGVcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkM6XFxcXFVzZXJzXFxcXERhdmlkIFNjaFx1MDBGNm5lXFxcXHNvdXJjZVxcXFxyZXBvc1xcXFxCRVhJUzJcXFxcQkVYSVMyLVJDXFxcXENvcmVcXFxcQ29uc29sZVxcXFxCRXhJUy5XZWIuU2hlbGxcXFxcQXJlYXNcXFxcU01NXFxcXEJFeElTLk1vZHVsZXMuU01NLlVJLlN2ZWx0ZVxcXFx2aXRlLmNvbmZpZy50c1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vQzovVXNlcnMvRGF2aWQlMjBTY2glQzMlQjZuZS9zb3VyY2UvcmVwb3MvQkVYSVMyL0JFWElTMi1SQy9Db3JlL0NvbnNvbGUvQkV4SVMuV2ViLlNoZWxsL0FyZWFzL1NNTS9CRXhJUy5Nb2R1bGVzLlNNTS5VSS5TdmVsdGUvdml0ZS5jb25maWcudHNcIjtpbXBvcnQgeyBzdmVsdGVraXQgfSBmcm9tICdAc3ZlbHRlanMva2l0L3ZpdGUnO1xyXG5pbXBvcnQgeyBkZWZpbmVDb25maWcgfSBmcm9tICd2aXRlc3QvY29uZmlnJztcclxuXHJcbmV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XHJcblx0cGx1Z2luczogW3N2ZWx0ZWtpdCgpXSxcclxuXHR0ZXN0OiB7XHJcblx0XHRpbmNsdWRlOiBbJ3NyYy8qKi8qLnt0ZXN0LHNwZWN9Lntqcyx0c30nXVxyXG5cdH1cclxufSk7XHJcbiJdLAogICJtYXBwaW5ncyI6ICI7QUFBcWpCLFNBQVMsaUJBQWlCO0FBQy9rQixTQUFTLG9CQUFvQjtBQUU3QixJQUFPLHNCQUFRLGFBQWE7QUFBQSxFQUMzQixTQUFTLENBQUMsVUFBVSxDQUFDO0FBQUEsRUFDckIsTUFBTTtBQUFBLElBQ0wsU0FBUyxDQUFDLDhCQUE4QjtBQUFBLEVBQ3pDO0FBQ0QsQ0FBQzsiLAogICJuYW1lcyI6IFtdCn0K

‎Modules/DDM/BExIS.Ddm.Providers.LuceneProvider/Searcher/BexisIndexSearcher.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ public static SearchResult search(Query query, List<XmlNode> headerItemXmlNodeLi
263263
Row r = new Row();
264264
List<object> ValueList = new List<object>();
265265
ValueList = new List<object>();
266-
ValueList.Add(doc.Get("doc_id"));
266+
ValueList.Add(Int64.Parse(doc.Get("doc_id")));
267267
ValueList.Add(doc.Get("gen_entity_name"));
268268
ValueList.Add(doc.Get("gen_entitytemplate"));
269269
ValueList.Add(doc.Get("gen_modifieddate"));

0 commit comments

Comments
 (0)