Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/641 delete test results and fix Noteneingabe combobox #147

Merged
merged 3 commits into from
Jan 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/hotfix-container-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

# If the current commit has no version tag, an image needs to be
# built, tagged and pushed to the registry
# If the build runs on test but test has already been built
# If the build runs on test but test has already been built
# with the latest tag, nothing happens
container-build-and-push-image:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -85,6 +85,8 @@ jobs:
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=raw,value=hotfix
type=raw,value=${{ steps.tag.outputs.new_tag }}-test
type=raw,value=${{ steps.tag.outputs.new_tag }}-production
type=semver,pattern={{version}},value=${{ steps.tag.outputs.new_tag }}

- name: Build and push Docker image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
// Todo: Combo-Box should be changed so the typed in value is not
// directly written to model.Value.
let modelValue = this.get('model.Value');
let isValid = !this.get('isDropdown') || this.get('model.DropdownItems').some(v => v.Key == modelValue);
let isValid = !this.get('isDropdown') || this.get('allowArbitraryText') || this.get('model.DropdownItems').some(v => v.Key == modelValue);
if (isValid) {
this.sendAction('save', this.get('model'));
} else {
Expand Down
2 changes: 1 addition & 1 deletion public/apps/webapp-schulverwaltung/679.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/apps/webapp-schulverwaltung/788.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/apps/webapp-schulverwaltung/main.js

Large diffs are not rendered by default.

Loading