ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'develop'

This commit is contained in:
Ramon Wenger 2019-10-15 16:23:11 +02:00
parent 23db6e373c 9837248881
commit cb54822535
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/cypress/integration/survey.spec.js
View File

@ -15,7 +15,7 @@ describe('Survey', () => {
cy.get('#sq_100i').type('Wohlwollen'); cy.get('#sq_100i').type('Wohlwollen');
cy.get('#sq_101i').type('Demut'); cy.get('#sq_101i').type('Demut');
cy.get('[value=Weiter]').click(); cy.get('[value="Speichern & Weiter"]').click();
//cy.get('.button--primary').click() //cy.get('.button--primary').click()
cy.get('#sq_102i').type('Keuschheit'); cy.get('#sq_102i').type('Keuschheit');

5
client/src/components/ContentBlock.vue
View File

@ -2,7 +2,8 @@
<div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}"> <div class="content-block__container hideable-element" :class="{'hideable-element--hidden': hidden}">
<div class="content-block" :class="specialClass"> <div class="content-block" :class="specialClass">
<div class="block-actions" v-if="canEditContentBlock && editModule"> <div class="block-actions" v-if="canEditContentBlock && editModule">
<user-widget :show-menu="false" v-bind="me" class="block-actions__user-widget content-block__user-widget"></user-widget> <user-widget :show-menu="false" v-bind="me"
class="block-actions__user-widget content-block__user-widget"></user-widget>
<more-options-widget> <more-options-widget>
<li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li> <li class="popover-links__link"><a @click="deleteContentBlock(contentBlock)">Löschen</a></li>
<li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li> <li class="popover-links__link"><a @click="editContentBlock(contentBlock)">Bearbeiten</a></li>
@ -228,7 +229,7 @@
if (index === 0) { if (index === 0) {
return content; return content;
}; }
const contentLists = content.filter(contentItem => contentItem.type === 'content_list'); const contentLists = content.filter(contentItem => contentItem.type === 'content_list');
if (contentLists.length !== 1) { if (contentLists.length !== 1) {