Skip to content

Commit b1dae50

Browse files
authored
fix: multiple improvements to solutions management (tprm) (#3538)
* allow solution name to be reused across different entities * prevent translating name in table and detailview * better lookup for solutions * format
1 parent 92edff2 commit b1dae50

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

backend/tprm/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ class Solution(NameDescriptionMixin, FilteringLabelMixin):
384384
help_text=_("Identification of alternative ICT third-party service providers"),
385385
)
386386

387-
fields_to_check = ["name"]
387+
fields_to_check = ["name", "provider_entity"]
388388

389389
class Meta:
390390
verbose_name = _("Solution")

frontend/src/lib/components/DetailView/DetailView.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@
654654
{formatDateOrDateTime(value, getLocale())}
655655
{:else if key === 'description' || key === 'observation' || key === 'annotation'}
656656
<MarkdownRenderer content={value} />
657-
{:else if m[toCamelCase(value.str || value.name)]}
657+
{:else if !['name', 'ref_id'].includes(key) && m[toCamelCase(value.str || value.name)]}
658658
{safeTranslate((value.str || value.name) ?? value)}
659659
{:else}
660660
{(value.str || value.name) ?? value}

frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
multiple
188188
optionsEndpoint="solutions"
189189
optionsDetailedUrlParameters={[['provider_entity', selectedEntity || '']]}
190+
optionsExtraFields={[['provider_entity', 'str']]}
190191
field="solutions"
191192
cacheLock={cacheLocks['solutions']}
192193
bind:cachedValue={formDataCache['solutions']}

frontend/src/lib/components/ModelTable/ModelTable.svelte

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -937,10 +937,13 @@
937937
{value.name}
938938
{:else}
939939
<!-- NOTE: We will have to handle the ellipses for RTL languages-->
940-
{#if value?.length > 300}
941-
{safeTranslate(value ?? '-').slice(0, 300)}...
940+
{@const displayValue = ['name', 'description', 'ref_id'].includes(key)
941+
? (value ?? '-')
942+
: safeTranslate(value ?? '-')}
943+
{#if displayValue?.length > 300}
944+
{displayValue.slice(0, 300)}...
942945
{:else}
943-
{safeTranslate(value ?? '-')}
946+
{displayValue}
944947
{/if}
945948
{/if}
946949
{@render badge?.(key, row)}

0 commit comments

Comments
 (0)