Merge branch 'main' into profile-page

This commit is contained in:
weeman 2022-01-14 13:09:46 +01:00
commit e3115f9944
3 changed files with 9 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"1": "Keine Angabe",
"2": "Grundkentnisse",
"2": "Grundkenntnisse",
"3": "Gut",
"4": "Fließend",
"5": "Muttersprache"

View File

@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
type="text"
class="form-control form-control-sm"
id="searchText"
maxlength="25"
:maxlength="maxlength"
:placeholder="placeholder"
v-model="searchText"
@input="search()"
@ -99,7 +99,10 @@ export default {
};
},
computed: {
...mapState(['currentUserId'])
...mapState(['currentUserId']),
maxlength() {
return this.type === 'skill' ? 50 : 25
}
},
methods: {
addResult(result = false) {

View File

@ -65,8 +65,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later
<i class="bi bi-x-square me-1"></i>
nein
</div>
<span
class="ms-3"
<span
class="ms-3"
v-if="profile.availability_status && profile.availability_hours_per_week">
({{ profile.availability_hours_per_week }} Stunden pro Woche)
</span>
@ -101,7 +101,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{{ profile.freetext }}
</div>
<div v-if="profile.volunteerwork" class="lh-base">
<h5>Ehrentamtliche Arbeit</h5>
<h5>Ehrenamtliche Arbeit</h5>
{{ profile.volunteerwork }}
</div>
</Section>