Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
custom-tzcld
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Components
custom-tzcld
Commits
9fa04e28
Commit
9fa04e28
authored
1 year ago
by
Antoine Dupré
Browse files
Options
Downloads
Patches
Plain Diff
fix: territory fields null and description white space normal
parent
15d0001e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#14709
passed
1 year ago
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/styles/index.scss
+3
-1
3 additions, 1 deletion
src/styles/index.scss
src/widjets-display-territory-tzcld.js
+19
-9
19 additions, 9 deletions
src/widjets-display-territory-tzcld.js
with
22 additions
and
10 deletions
src/styles/index.scss
+
3
−
1
View file @
9fa04e28
...
...
@@ -315,7 +315,9 @@ solid-form {
box-shadow
:
none
!
important
;
}
}
.white-space-normal
{
white-space
:
normal
!
important
;
}
/* All link on main */
main
.link
{
color
:
var
(
--
color-primary
);
...
...
This diff is collapsed.
Click to expand it.
src/widjets-display-territory-tzcld.js
+
19
−
9
View file @
9fa04e28
...
...
@@ -249,16 +249,26 @@ import("./utils.js").then((utils) => {
</div>`
;
render
+=
`<div><solid-display class="segment" bind-resources="" nested-field="tzcld_profile" fields="regions"
widget-regions="customtzcld-display-territory-regions"
data-src="
${
tzcldprofile
.
id
}
" solid-resource=""></solid-display>
<div class="region segment tag color-fourth">
${
await
etiquettes
.
kind
.
name
}
</div>
<div class="region segment tag color-fourth">
${
await
etiquettes
.
step_state
.
name
}
</div>
</div>
render
+=
`<div class="margin-top-xxsmall">
<solid-display class="segment" bind-resources="" nested-field="tzcld_profile" fields="regions" widget-regions="customtzcld-display-territory-regions" data-src="
${
tzcldprofile
.
id
}
" solid-resource=""></solid-display>`
;
if
(
await
etiquettes
.
kind
!=
null
)
{
render
+=
`<div class="region segment tag color-fourth">
${
await
etiquettes
.
kind
.
name
}
</div>`
;
}
console
.
log
(
etiquettes
.
step_state
)
;
if
(
await
etiquettes
.
step_state
!=
null
)
{
render
+=
`<div class="region segment tag color-fourth">
${
await
etiquettes
.
step_state
.
name
}
</div>`
;
}
render
+=
`</div>`
;
<div class="margin-top-small"><a class="text-color-primary" href="
${
await
tzcldprofile
.
profile
.
website
}
">
${
await
tzcldprofile
.
profile
.
website
}
</a></div>
<div class="description margin-top-small">
${
await
tzcldprofile
.
profile
.
description
}
</div>
</div>
if
(
await
tzcldprofile
.
profile
.
website
!=
''
)
{
render
+=
`<div class="margin-top-small"><a class="text-color-primary" href="
${
await
tzcldprofile
.
profile
.
website
}
">
${
await
tzcldprofile
.
profile
.
website
}
</a></div>`
;
}
if
(
await
tzcldprofile
.
profile
.
description
!=
''
)
{
render
+=
`<div class="description margin-top-small white-space-normal">
${
await
tzcldprofile
.
profile
.
description
}
</div>`
;
}
render
+=
`</div>
</div>`
;
//tzcld-territory-profile-wrapper
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment