Skip to content

Commit 0d4769f

Browse files
escopeczescopecz
authored
Merge branch '7.x' into prevent-duplicate-project-names
2 parents f99dd9f + 2d61136 commit 0d4769f

File tree

43 files changed

+1684
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1684
-118
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,6 +1652,15 @@
16521652
"contributions": [
16531653
"code"
16541654
]
1655+
},
1656+
{
1657+
"login": "kniziol",
1658+
"name": "Krzysztof Nizioł",
1659+
"avatar_url": "https://avatars.githubusercontent.com/u/947620?v=4",
1660+
"profile": "https://niziol.me",
1661+
"contributions": [
1662+
"code"
1663+
]
16551664
}
16561665
],
16571666
"contributorsPerLine": 7,

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
357357
<td align="center" valign="top" width="14.28%"><a href="https://github.com/naoya-kawakatsu"><img src="https://avatars.githubusercontent.com/u/49386563?v=4?s=100" width="100px;" alt="naoya-kawakatsu"/><br /><sub><b>naoya-kawakatsu</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=naoya-kawakatsu" title="Code">💻</a></td>
358358
<td align="center" valign="top" width="14.28%"><a href="https://github.com/BeniShoga1"><img src="https://avatars.githubusercontent.com/u/197698659?v=4?s=100" width="100px;" alt="Benisyoga"/><br /><sub><b>Benisyoga</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=BeniShoga1" title="Code">💻</a></td>
359359
</tr>
360+
<tr>
361+
<td align="center" valign="top" width="14.28%"><a href="https://niziol.me"><img src="https://avatars.githubusercontent.com/u/947620?v=4?s=100" width="100px;" alt="Krzysztof Nizioł"/><br /><sub><b>Krzysztof Nizioł</b></sub></a><br /><a href="https://github.com/mautic/mautic/commits?author=kniziol" title="Code">💻</a></td>
362+
</tr>
360363
</tbody>
361364
</table>
362365

‎app/bundles/CoreBundle/Assets/js/1a.content.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,10 +1153,7 @@ Mautic.activateMultiSelect = function(el) {
11531153
if (isSortable) {
11541154
mQuery(el).parent('.choice-wrapper').find('.ms-selection').first().sortable({
11551155
items: '.ms-elem-selection',
1156-
helper: function (e, ui) {
1157-
ui.width(mQuery(el).width());
1158-
return ui;
1159-
},
1156+
helper: 'clone',
11601157
axis: 'y',
11611158
scroll: false,
11621159
update: function(event, ui) {

‎app/bundles/CoreBundle/Controller/AjaxController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ public function togglePublishStatusAction(Request $request): JsonResponse
281281
'onclick' => $onclickMethod,
282282
'attributes' => $dataAttr,
283283
'transKeys' => $attrTransKeys,
284+
'status' => method_exists($entity, 'getPublishStatus') ? $entity->getPublishStatus() : null,
284285
]
285286
);
286287
$dataArray['statusHtml'] = $html;

‎app/bundles/CoreBundle/Entity/FormEntity.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function isPublished($checkPublishStatus = true, $checkCategoryStatus = t
244244
}
245245
}
246246

247-
return ('published' == $status) ? true : false;
247+
return 'published' === $status;
248248
}
249249

250250
return $this->getIsPublished();

‎app/bundles/CoreBundle/Resources/views/Helper/publishstatus_badge.html.twig‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
'published': {'icon': 'success', 'text': 'green'},
33
'unpublished': {'icon': 'danger', 'text': 'red'},
44
'expired': {'icon': 'info', 'text': 'blue'},
5-
'pending': {'icon': 'info', 'text': 'blue'}
5+
'pending': {'icon': 'info', 'text': 'blue'},
6+
'sent': {'icon': 'info', 'text': 'blue'},
7+
'sending': {'icon': 'success', 'text': 'green'},
68
} %}
79

810
{# Define the labels based on the combination of status and publishStatus #}
@@ -11,27 +13,35 @@
1113
'published': 'mautic.core.form.available',
1214
'pending': 'mautic.core.form.not_yet_available',
1315
'expired': 'mautic.core.form.no_longer_available',
14-
'unpublished': 'mautic.core.form.unavailable'
16+
'unpublished': 'mautic.core.form.unavailable',
17+
'sent': 'mautic.email.stat.sent',
18+
'sending': 'mautic.core.form.sending',
1519
},
1620
'sending': {
1721
'published': 'mautic.core.form.sending',
1822
'pending': 'mautic.core.form.scheduled_to_send',
1923
'expired': 'mautic.core.form.sending_expired',
20-
'unpublished': 'mautic.core.form.unavailable'
24+
'unpublished': 'mautic.core.form.unavailable',
25+
'sent': 'mautic.email.stat.sent',
26+
'sending': 'mautic.core.form.sending',
2127
},
2228
'active': {
2329
'published': 'mautic.core.form.active',
2430
'pending': 'mautic.core.form.pending',
2531
'expired': 'mautic.core.form.expired',
26-
'unpublished': 'mautic.core.form.inactive'
32+
'unpublished': 'mautic.core.form.inactive',
33+
'sent': 'mautic.email.stat.sent',
34+
'sending': 'mautic.core.form.sending',
2735
}
2836
} %}
2937

30-
{% set labelTextKey = (labelMappings[status|default('active')][entity.getPublishStatus()]) %}
38+
{% set sendingStatus = sendingStatus|default(entity.getPublishStatus()) %}
3139

32-
<div class="label label-{{ statusColors[entity.getPublishStatus()].text }} d-inline-flex ai-center gap-xs fw-b"{% if simplified is defined and simplified %} size="sm"{% endif %}>
40+
{% set labelTextKey = (labelMappings[status|default('active')][sendingStatus]) %}
41+
42+
<div class="label label-{{ statusColors[sendingStatus].text }} d-inline-flex ai-center gap-xs fw-b"{% if simplified is defined and simplified %} size="sm"{% endif %}>
3343
{% if not (simplified is defined and simplified) %}
34-
<span aria-hidden="true" focusable="false" class="bg-{{ statusColors[entity.getPublishStatus()].icon }} publishstatus_pulse">
44+
<span aria-hidden="true" focusable="false" class="bg-{{ statusColors[sendingStatus].icon }} publishstatus_pulse">
3545
</span>
3646
{% endif %}
3747
{{ labelTextKey|trans }}

‎app/bundles/CoreBundle/Resources/views/Helper/publishstatus_icon.html.twig‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,18 @@
3434
{%- set icon = 'ri-toggle-line text-danger' %}
3535
{%- set text = 'mautic.core.form.inactive'|trans %}
3636
{%- elseif status is same as 'expired' %}
37-
{%- set icon = 'ri-checkbox-circle-line text-info' %}
38-
{%- set text = 'mautic.core.form.expired_to'|trans({'%date%': dateToFull(item.publishDown)}) %}
37+
{%- set icon = 'ri-checkbox-circle-line text-info' %}
38+
{%- set text = 'mautic.core.form.expired_to'|trans({'%date%': dateToFull(item.publishDown)}) %}
3939
{%- elseif status is same as 'pending' %}
40-
{%- set icon = 'ri-donut-chart-line text-info' %}
41-
{%- set text = 'mautic.core.form.pending.start_at'|trans({'%date%': dateToFull(item.publishUp)}) %}
40+
{%- set icon = 'ri-donut-chart-line text-info' %}
41+
{%- set text = 'mautic.core.form.pending.start_at'|trans({'%date%': dateToFull(item.publishUp)}) %}
42+
{%- elseif status is same as 'sending' %}
43+
{%- set icon = 'ri-send-plane-line text-info' %}
44+
{%- set text = 'mautic.core.form.sending'|trans %}
45+
{%- elseif status is same as 'sent' %}
46+
{%- set icon = 'ri-checkbox-circle-line text-info' %}
47+
{%- set text = 'mautic.core.form.sent'|trans %}
4248
{%- endif %}
43-
4449
{%- if true is same as status %}
4550
{%- set icon = 'ri-toggle-fill text-success' %}
4651
{%- set text = 'mautic.core.form.public'|trans %}

‎app/bundles/CoreBundle/Translations/en_US/messages.ini‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,8 @@ mautic.core.form.active="Active"
333333
mautic.core.form.activate_at="Activate at (date/time)"
334334
mautic.core.form.sending.start_at="Start sending at (date/time)"
335335
mautic.core.form.sending.stop_at="Stop sending at (date/time)"
336+
mautic.core.form.sending="Sending"
337+
mautic.core.form.sent="Sent"
336338
mautic.core.form.public="Public"
337339
mautic.core.form.not.public="Not public"
338340
mautic.core.form.reset="Clear"
@@ -683,6 +685,7 @@ mautic.core.export.csv="Export to CSV"
683685
mautic.core.export.zip="Export to ZIP"
684686
mautic.core.export.xlsx="Export to Excel"
685687
mautic.core.export.items="Export selected %items%?"
688+
mautic.core.export.by.past.tense="Exported by"
686689
mautic.core.dynamicContent="Dynamic Content"
687690
mautic.core.dynamicContent.token_name="Name"
688691
mautic.core.dynamicContent.tab="Variation"

‎app/bundles/CoreBundle/Translations/en_US/validators.ini‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ mautic.core.invalid_file_type="Invalid file type {{ type }}. Use a file that mat
1919
mautic.core.invalid_file_encoding="The file is not encoded correctly into UTF-8."
2020
mautic.core.not.allowed.file.extension="%extension% is not an allowed file extension"
2121
mautic.core.regex.invalid="The regex syntax is invalid."
22+
mautic.form.date_time_range.invalid_range="Please set the stop sending date to be after the start sending date."
2223
mautic.core.config.form.image.path.invalid="The image path is invalid."
2324
mautic.core.config.form.image.path.invalid.not.media="The image path is invalid. It must begin with media/."
2425
mautic.core.config.form.image.path.invalid.folder.not.exists="The image path is invalid. The folder does not exist."

‎app/bundles/DashboardBundle/Controller/DashboardController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ public function newAction(Request $request, FormFactoryInterface $formFactory)
172172
$passthroughVars['widgetId'] = $widget->getId();
173173
$passthroughVars['widgetWidth'] = $widget->getWidth();
174174
$passthroughVars['widgetHeight'] = $widget->getHeight();
175+
$this->addFlashMessage('mautic.dashboard.widget.created');
175176
}
177+
$passthroughVars['flashes'] = $this->getFlashContent();
176178

177179
return new JsonResponse($passthroughVars);
178180
} else {

0 commit comments

Comments
 (0)