Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
{{ if gt $nested 1 }}
nested: {
depth: {{ $nested }},
subfolders: true,
summary: '{{`{{title}}`}}'
},
{{ partialCached "admin/cms/decapcms/collection/config/parent.yml" . }}
{{ partialCached "admin/cms/decapcms/collection/config/parent.yml" . . }}
{{ end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if gt site.Params.admin.nested.depth 2 }}
{{ $nested := (index site.Params.admin.collections .).nested.depth | default site.Params.admin.nested.depth }}
{{ if gt $nested 2 }}
meta: {
path: {
label: '{{ i18n "admin.fields.parent.label" }}',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ nested: {
depth: {{ $nested }},
summary: '{{`{{title}}`}}'
},
{{ partialCached "admin/cms/staticcms/collection/config/parent.yml" . }}
{{ partialCached "admin/cms/staticcms/collection/config/parent.yml" . . }}
{{ end }}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if gt site.Params.admin.nested.depth 2 }}
{{ $nested := (index site.Params.admin.collections .).nested.depth | default site.Params.admin.nested.depth }}
{{ if gt $nested 2 }}
meta: {
path: {
label: '{{ i18n "admin.fields.parent.label" }}',
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/admin/collections/types/expertises.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
i18n: true,
{{ partial "admin/collections/config/create.yml" . }}
{{ partial "admin/collections/config/preview.yml" . }}
{{ partial "admin/collections/config/path.yml" "{{slug}}" }}
{{ partial "admin/collections/config/path.yml" . }}
{{ partial "admin/collections/config/slug.yml" . }}

{{ partial "admin/collections/types/_default.yml" . }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/admin/collections/types/persons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
i18n: true,
{{ partial "admin/collections/config/create.yml" . }}
{{ partial "admin/collections/config/preview.yml" . }}
{{ partial "admin/collections/config/path.yml" "{{slug}}" }}
{{ partial "admin/collections/config/path.yml" . }}
{{ partial "admin/collections/config/slug.yml" . }}

{{ partial "admin/collections/types/_default.yml" . }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/admin/collections/types/posts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
i18n: true,
{{ partial "admin/collections/config/create.yml" . }}
{{ partial "admin/collections/config/preview.yml" . }}
{{ partial "admin/collections/config/path.yml" "{{year}}/{{month}}/{{slug}}" }}
{{ partial "admin/collections/config/slug.yml" "{{year}}-{{month}}-{{day}}-{{slug}}" }}
{{ partial "admin/collections/config/path.yml" . }}
{{ partial "admin/collections/config/slug.yml" . }}

{{ partial "admin/collections/types/_default.yml" . }}
}
7 changes: 4 additions & 3 deletions scripts/build-config-cloudcannon.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
* @requires path
*/

const { exec } = require('child_process');
const { execFile } = require('child_process');
const fs = require('fs');
const path = require('path');

// Function to execute a shell command
// Function to execute a command without invoking a shell (avoids command injection)
function runCommand(command) {
return new Promise((resolve, reject) => {
console.log(`Executing: ${command}`);
const process = exec(command);
const [cmd, ...args] = command.split(' ');
const process = execFile(cmd, args);

process.stdout.on('data', (data) => {
console.log(data.toString());
Expand Down