Skip to content

Commit

Permalink
Development (#394)
Browse files Browse the repository at this point in the history
* Make it possible to set the href on the counter

* Set counterUrl without lodash lib

* Add a message when the widget is used on a non-idea resource page and when you are logged in as admin, moderator or editor

* Made it so the title can be changed of the succesfull voting message

* Added field to phase-voting-budgeting

* Corrected spelling

* Corrected spelling

* Changed spelling of successful

* Changed spelling of step_3_successful_auth

* changed spelling in label of field

* Added message closed but open for admin / editor / moderator

* Update packages/cms/lib/modules/arguments-block-widgets/index.js

Co-authored-by: Rudi van Hierden <rudi@draad.nl>

* Update packages/cms/lib/modules/arguments-block-widgets/views/widget.html

Co-authored-by: Rudi van Hierden <rudi@draad.nl>

* Aloow for multiple tabs sections on a page

* Make js uglifyable

* Added fallback text because if you did not commit on a preexisting form then the message will not be rendered

* Feature/group tags like mzm (#386)

* Added grouping capabilities to tags on ideas(plannen) on create plannen page

* Added tagid to checbox and label instead of non working option

* specify if theme labels should be shown

* Made it so tags can be grouped by use of extraData.theme

* Changed default of showing labels to false for and made name consistent

* Changed implementation to use type

* Put back cache

* Renamed theme fields to tagType

* Added cache key for if an empty list was fetched

* Added cachekey for empty list

* Bugfix/tags remember choices on edit idea (#389)

* added forgotten groupedTags from cache

* Clean up test code

* Added fallback when choosing static form with dynamic fields

* make inzendingPath the same as global config > ideaSlug (#392)

* Changed reading of activeResource param in html (#393)

---------

Co-authored-by: Rudi van Hierden <rudi@draad.nl>
Co-authored-by: Niels Vegter <niels@denes.nl>
  • Loading branch information
3 people committed May 5, 2023
1 parent 9fdab48 commit c22e85e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion packages/cms/lib/modules/openstad-api/lib/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,12 @@ module.exports = (self, options) => {
};

self.updateSiteConfig = async (req, siteConfig, item, apiSyncFields) => {

apiSyncFields.forEach(field => {
if(field.name === 'ideaSlug') {
siteConfig.ideas.feedbackEmail["inzendingPath"] = item.ideaSlug;
siteConfig.ideas.conceptEmail["inzendingPath"] = item.ideaSlug;
siteConfig.ideas.conceptToPublishedEmail["inzendingPath"] = item.ideaSlug;
}
//item is the inter global config
const value = self.getFieldValue(item, field);
self.setApiConfigValue(siteConfig, field.apiSyncField, value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ <h4> Activiteit op deze website {{data.nielsisgek}}
</h4>
<ul class="user-activity-list">

{% if data.widget.activeResource.activity %}
{% for activity in data.widget.activeResource.activity %}
{% if data.activeResource.activity %}
{% for activity in data.activeResource.activity %}
{% if data.global.siteId === activity.site.id %}
{% set counterThisSite = counterThisSite + 1 %}

Expand All @@ -25,8 +25,8 @@ <h4> Activiteit op deze website {{data.nielsisgek}}
<br />
<h4> Activiteit op andere websites</h4>
<ul class="user-activity-list">
{% if data.widget.activeResource.activity %}
{% for activity in data.widget.activeResource.activity %}
{% if data.activeResource.activity %}
{% for activity in data.activeResource.activity %}
{% if data.global.siteId !== activity.site.id %}
{% set counterOtherSites = counterOtherSites + 1 %}

Expand Down

1 comment on commit c22e85e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Published new image: openstad/frontend:master-c22e85e

Please sign in to comment.