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", "1": "Keine Angabe",
"2": "Grundkentnisse", "2": "Grundkenntnisse",
"3": "Gut", "3": "Gut",
"4": "Fließend", "4": "Fließend",
"5": "Muttersprache" "5": "Muttersprache"

View File

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

View File

@ -101,7 +101,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
{{ profile.freetext }} {{ profile.freetext }}
</div> </div>
<div v-if="profile.volunteerwork" class="lh-base"> <div v-if="profile.volunteerwork" class="lh-base">
<h5>Ehrentamtliche Arbeit</h5> <h5>Ehrenamtliche Arbeit</h5>
{{ profile.volunteerwork }} {{ profile.volunteerwork }}
</div> </div>
</Section> </Section>