Skip to content

Commit

Permalink
Merge pull request #511 from lblod/chore/bump-plugins-v8.2.2
Browse files Browse the repository at this point in the history
GN-4403: use correct config for variables
  • Loading branch information
abeforgit authored Jun 28, 2023
2 parents c833571 + 8f1ba59 commit e090f9d
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 12 deletions.
6 changes: 6 additions & 0 deletions app/controllers/agendapoints/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ import {
variable,
variableView,
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/nodes';
import {
number,
numberView,
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number';
import {
bullet_list,
list_item,
Expand Down Expand Up @@ -109,6 +113,7 @@ export default class AgendapointsEditController extends Controller {
date: date(this.config.date),
STRUCTURE_NODES,
regulatoryStatementNode,
number,
variable,
...besluitNodes,
roadsign_regulation,
Expand Down Expand Up @@ -195,6 +200,7 @@ export default class AgendapointsEditController extends Controller {
link: linkView(this.config.link)(controller),
image: imageView(controller),
date: dateView(this.config.date)(controller),
number: numberView(controller),
};
};
}
Expand Down
7 changes: 6 additions & 1 deletion app/controllers/regulatory-statements/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ import {
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/rdfa-date-plugin/nodes/date';

import { Schema } from '@lblod/ember-rdfa-editor';

import {
number,
numberView,
} from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/variable-plugin/number';
import { citationPlugin } from '@lblod/ember-rdfa-editor-lblod-plugins/plugins/citation-plugin';
import {
createInvisiblesPlugin,
Expand Down Expand Up @@ -101,6 +104,7 @@ export default class RegulatoryStatementsRoute extends Controller {
placeholder,
...tableNodes({ tableGroup: 'block', cellContent: 'block+' }),
date: date(this.config.date),
number,
variable,
...STRUCTURE_NODES,
heading,
Expand Down Expand Up @@ -137,6 +141,7 @@ export default class RegulatoryStatementsRoute extends Controller {
link: linkView(this.config.link)(controller),
image: imageView(controller),
date: dateView(this.config.date)(controller),
number: numberView(controller),
};
};
}
Expand Down
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ module.exports = function (environment) {
ENV.featureFlags['regulatory-statements'] = true;
ENV.featureFlags['prosemirror-dev-tools'] = true;
ENV.roadsignRegulationPlugin.endpoint =
'https://dev.roadsigns.lblod.info/sparql';
'https://dev.roadsigns.lblod.info/raw-sparql';
ENV.roadsignRegulationPlugin.imageBaseUrl =
'https://register.mobiliteit.vlaanderen.be/';
ENV.templateVariablePlugin.endpoint =
Expand Down
28 changes: 19 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@lblod/ember-environment-banner": "^0.2.0",
"@lblod/ember-mock-login": "0.7.0",
"@lblod/ember-rdfa-editor": "^3.10.0",
"@lblod/ember-rdfa-editor-lblod-plugins": "^8.1.0",
"@lblod/ember-rdfa-editor-lblod-plugins": "^8.2.2",
"@release-it-plugins/lerna-changelog": "^5.0.0",
"broccoli-asset-rev": "^3.0.0",
"broccoli-plugin": "^4.0.7",
Expand Down

0 comments on commit e090f9d

Please sign in to comment.