Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ jobs:
- name: Install Node.js dependencies
run: "npm ci"
- name: Build admin CMS
env:
FIPGUIDE_BRANCH: ${{ github.ref_name }}
run: "npm run build:admin"
- name: Cache Hugo Resources
uses: actions/cache@v4
Expand All @@ -63,7 +65,6 @@ jobs:
env:
HUGO_CACHEDIR: ${{ runner.temp }}/hugo_cache
HUGO_ENVIRONMENT: production
FIPGUIDE_BRANCH: ${{ github.ref_name }}
TZ: Europe/Berlin
run: |
hugo \
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ repos:
exclude:
glob:
- "**/validity.yaml"
- "layouts/admin/section.cmsconfig.yml"
- id: debug-statements
- id: destroyed-symlinks
- id: end-of-file-fixer
Expand Down
12 changes: 5 additions & 7 deletions assets/admin/fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@ function FipValiditySelectControl(props) {
var groups = props.entry ? props.entry.getIn(["data", "groups"]) : null;
groups = groups && typeof groups.toJS === "function" ? groups.toJS() : [];
var groupType = props.field ? props.field.get("group_type") : null;
if (groupType) {
groups = groups.filter(function (group) {
return !group.type || group.type === groupType;
});
}

var options = groups
.filter(function (group) {
return !!group.name;
return (
!!group.id && (!groupType || !group.type || group.type === groupType)
);
})
.map(function (group) {
return { label: group.name, value: group.name };
return { label: group.id, value: group.id };
});

return h(SelectControl, {
Expand Down
Loading
Loading