Skip to content

Commit 65e1733

Browse files
authored
Merge pull request #641 from ExpressionEngine/7.dev
7.dev to 7.x for go live
2 parents d75e6a6 + 901cd6c commit 65e1733

File tree

7 files changed

+81
-15
lines changed

7 files changed

+81
-15
lines changed

docs/add-ons/pro-variables/type.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@ Displays a date picker. To output anything other than a timestamp, use the `{exp
4848

4949
{exp:pro_variables:single var="my_var" modifier="relative"}
5050

51+
## File
52+
53+
Uses the native [File field](/fieldtypes/file.md). To output the variable, always use the `{exp:pro_variables:pair}` or `{exp:pro_variables:single}` tag where appropriate. If you try to address the variable by name only, it will return the content unparsed, e.g. `{file:XX:url}`. You can use File field [parameters](/fieldtypes/file.md#template-tag-usage) and [variables](/fieldtypes/grid.md#template-tags) using these tags. Additionally, one more parameter is available:
54+
55+
### Parameters
56+
57+
#### `modifier`
58+
59+
Allows applying modifiers, which, among other, are used to apply [on-the-fly image manipulations](/fieldtypes/grid.md#on-the-fly-image-manipulations) to files
60+
5161
## Grid
5262

5363
Uses the native [Grid field](/fieldtypes/grid.md). All native types are available, _except for Relationships_. To output the variable, use the `{exp:pro_variables:pair}` or `{exp:pro_variables:single}` tag where appropriate. You can use any of Grid’s [parameters](/fieldtypes/grid.md#parameters) and [variables](/fieldtypes/grid.ms#variables) using these tags. Additionally, one more parameter is available:

docs/channels/channel-form/examples.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383
{custom_fields}
8484
<label for="{field_name}">{if required}* {/if}{field_label}</label>
8585
{field_instructions}
86-
{formatting_buttons}
8786

8887
{if error}
8988
<p class="error">{error}</p>

docs/channels/channel-form/fields.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ The Custom fields tag pair will conveniently show all your custom fields, but it
1919

2020
<label for="{field_name}">{if required}* {/if}{field_label}</label>
2121
{field_instructions}
22-
{formatting_buttons}
2322

2423
{if error}
2524
<p class="error">{error}</p>

docs/channels/channel-form/overview.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ If using a field with options, such as Checkboxes or Dropdown, you can display t
290290
{custom_fields}
291291
<label for="{field_name}">{if required}* {/if}{field_label}</label>
292292
{field_instructions}
293-
{formatting_buttons}
294293

295294
{if error}
296295
<p class="error">{error}</p>
@@ -383,7 +382,6 @@ Within this loop, you have the following single variables:
383382
{field_id}
384383
{error}
385384
{field_instructions}
386-
{formatting_buttons} - Shows the EE formatting buttons if have that option selected for that field
387385
{display_field} - Displays the field as it appears in the CP (using the fieldtype API display_field method)
388386
{text_direction}
389387
{rows} - For textareas

docs/development/services/alert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Alerts are for providing feedback on an action and calling attention to warnings
3131

3232
[TOC=3]
3333

34-
### `make($name, $type = 'inline')`
34+
### `make($name, $type = 'alert')`
3535

3636
Makes a new named alert of the specified type.
3737

docs/installation/changelog.md

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,62 @@
88
-->
99
# ExpressionEngine v7 Change Log
1010

11+
## Version 7.2.17
12+
(Release: May 2, 2023)
13+
14+
- **Contributors** 🙌
15+
<div class="max-w-7xl mx-autotext-center">
16+
<div class="space-y-8 sm:space-y-12">
17+
<ul role="list" class="mx-auto grid grid-cols-2 gap-x-4 gap-y-1 sm:grid-cols-4 md:gap-x-6 lg:max-w-5xl lg:gap-x-8 lg:gap-y-1 xl:grid-cols-5">
18+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/563996?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Bryan Nielsen</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=bryannielsen" target="_BLANK">@bryannielsen</a></p></div></div></div></li>
19+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/931642?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Sobral</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=robsonsobral" target="_BLANK">@robsonsobral</a></p></div></div></div></li>
20+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/23382425?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yulya Lebed</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=Yulyaswan" target="_BLANK">@Yulyaswan</a></p></div></div></div></li>
21+
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/752126?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yuri Salimovskiy</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=intoeetive" target="_BLANK">@intoeetive</a></p></div></div></div></li>
22+
</ul>
23+
</div>
24+
</div>
25+
26+
**Enhancements** 🚀
27+
28+
- Improved counting members on role
29+
- Added extra information on RTE advanced configuration
30+
- Resolved issue where icons on Channels page were not self-evident
31+
- Enabled File field to be used as Pro Variable; [#2498](https://github.com/ExpressionEngine/ExpressionEngine/issues/2498)
32+
- Added separate list with selected categories for Entry page Category tab [#2807](https://github.com/ExpressionEngine/ExpressionEngine/issues/2807)
33+
- Added more information to template debugger when using `search` parameter in `exp:channel:entries`; [#2670](https://github.com/ExpressionEngine/ExpressionEngine/issues/2670)
34+
35+
**Bug Fixes** 💃🐛
36+
37+
- Wrap Structure global functions to avoid conflict
38+
- Resolved [#3261](https://github.com/ExpressionEngine/ExpressionEngine/issues/3261) where empty Grid row could have been added in Fluid upon saving
39+
- Resolved [#2148](https://github.com/ExpressionEngine/ExpressionEngine/issues/2148) where entry status was not updated after change of status name
40+
- Resolved [#477](https://github.com/ExpressionEngine/ExpressionEngine/issues/477) where no information was provided when editing entry with status that's not accessible to member
41+
- Resolved [#3331](https://github.com/ExpressionEngine/ExpressionEngine/issues/3331) Where Categories tab shows empty alert when no category groups assigned
42+
- Resolved [#758](https://github.com/ExpressionEngine/ExpressionEngine/issues/758) where installation wizard did not work when PHP was configured to have no memory limit
43+
- Resolved [#1795](https://github.com/ExpressionEngine/ExpressionEngine/issues/1795) Where display of negative numerical field has - placed incorrectly for RTL text direction
44+
- Resolved issue where setting member field type might not work properly when called programmatically
45+
- Resolved [#3224](https://github.com/ExpressionEngine/ExpressionEngine/issues/3224) where descending sorting order did not persist when using pagination in File Manager
46+
- Resolved [#2609](https://github.com/ExpressionEngine/ExpressionEngine/issues/2609) where the permissions for Guests role could be incorrect and Guest could log in
47+
- Resolved [#2570](https://github.com/ExpressionEngine/ExpressionEngine/issues/2570) where saving empty "Select Entries" Pro Variable was throwing SQL error
48+
- Resolved [#2843](https://github.com/ExpressionEngine/ExpressionEngine/issues/2843) where Channel Form was saving file field data in old format
49+
- Resolved [#2112](https://github.com/ExpressionEngine/ExpressionEngine/issues/2112) where deleting too many logs could cause the system go out of memory
50+
- Resolved [#2387](https://github.com/ExpressionEngine/ExpressionEngine/issues/2387) where PHP error could be shown when several developer logs are existing
51+
- Resolved [#3286](https://github.com/ExpressionEngine/ExpressionEngine/issues/3286) when warning was shown when using member fields with PHP 8.2
52+
53+
**Developers** 💻
54+
55+
- Added `GridColumn` model
56+
- Improve error reporting when instantiating non-existent model
57+
- Added relationships to model definitions that were missing
58+
- Improve string-to-boolean conversion; [#1959](https://github.com/ExpressionEngine/ExpressionEngine/issues/1959)
59+
1160
## Version 7.2.16
1261
(Release: April 24, 2023)
1362

1463
- **Contributors** 🙌
1564
<div class="max-w-7xl mx-autotext-center">
1665
<div class="space-y-8 sm:space-y-12">
1766
<ul role="list" class="mx-auto grid grid-cols-2 gap-x-4 gap-y-1 sm:grid-cols-4 md:gap-x-6 lg:max-w-5xl lg:gap-x-8 lg:gap-y-1 xl:grid-cols-5">
18-
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/563996?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Bryan Nielsen</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=bryannielsen" target="_BLANK">@bryannielsen</a></p></div></div></div></li>
19-
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/11818941?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Matt Johnson</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=matthewjohns0n" target="_BLANK">@matthewjohns0n</a></p></div></div></div></li>
2067
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/931642?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Sobral</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=robsonsobral" target="_BLANK">@robsonsobral</a></p></div></div></div></li>
2168
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/23382425?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yulya Lebed</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=Yulyaswan" target="_BLANK">@Yulyaswan</a></p></div></div></div></li>
2269
<li><div class="space-y-4 text-center"><img class="mx-auto h-20 w-20 rounded-full lg:w-24 lg:h-24" src="https://avatars.githubusercontent.com/u/752126?v=4" /><div class="space-y-2"><div class="text-xs font-medium lg:text-sm"><p class="mb-1">Yuri Salimovskiy</p><p class="text-indigo-600"><a href="https://github.com/ExpressionEngine/ExpressionEngine/commits?author=intoeetive" target="_BLANK">@intoeetive</a></p></div></div></div></li>
@@ -28,13 +75,11 @@
2875

2976
- Optimize logging developer messages; [#3057](https://github.com/ExpressionEngine/ExpressionEngine/issues/3057)
3077
- Added keyboard shortcut for saving Pro Variables
31-
- Added icon for video file
32-
- Added icon for doc file type
33-
- Installer / Updated now respects default theme colors
34-
- Remove "blinks" into the drak on script loads
35-
- Made styles a bit more generic for multiselect
36-
- Added additional styles for long channel titles
37-
- Resolved [#518](https://github.com/ExpressionEngine/ExpressionEngine/issues/518) where include in search was present on relaionthips and shouldn't be
78+
- Resolved [#3222](https://github.com/ExpressionEngine/ExpressionEngine/issues/3222) where File icon in File field does not match field type
79+
- Resolved [#2028](https://github.com/ExpressionEngine/ExpressionEngine/issues/2028) where Installer/Updater does not respect the theme
80+
- Resolved [#3247](https://github.com/ExpressionEngine/ExpressionEngine/issues/3247), where H2 tag didn't respect theme colors on Redactor RTE
81+
- Improved styles for Pages add-on settings
82+
- Improved [#518](https://github.com/ExpressionEngine/ExpressionEngine/issues/518) where 'Include in search' option from Relationships field should have been hidden.
3883

3984
**Bug Fixes** 💃🐛
4085

@@ -50,7 +95,7 @@
5095
- Resolved [#3302](https://github.com/ExpressionEngine/ExpressionEngine/issues/3302) where Structure was showing deprecation notices when using PHP 8.2
5196
- Resolved [#3191](https://github.com/ExpressionEngine/ExpressionEngine/issues/3191) where PHP errors could be shown when installing add-on that have a fieldtype and module
5297
- Resolved [#3286](https://github.com/ExpressionEngine/ExpressionEngine/issues/3286) where PHP errors could be thrown on creating of a dynamic property
53-
- Resolved [#510](https://github.com/ExpressionEngine/ExpressionEngine/issues/510) where Toggle field conditionals on frontend didn't handle defaults correctly
98+
- Resolved [#510](https://github.com/ExpressionEngine/ExpressionEngine/issues/510) where existing entries did not have the correct value for toggle field after it was added to a channel it also did not prompt to update existing entries with the default toggle value
5499

55100
## Version 7.2.15
56101
(Release: April 12, 2023)

docs/templates/conditionals.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,21 @@ Tags that output numeric content will work fine with quotes, but also do not nee
281281

282282
{if {fluid_content:count type="long_form_text"} == 3}
283283

284+
If the conditional expression contains [variable modifiers](templates/variable-modifiers.md), braces should only be omited if the conditional is executed on a top-level variable (not Grid column or Fluid field element) and when there is only one check in the expression (no AND / OR operators).
285+
In other words, you can only do following without braces:
286+
287+
{if grid_field:total_rows}
288+
289+
But you will need braces in there cases:
290+
291+
{if {grid_field:total_rows} AND {another_grid_field:total_rows}}
292+
293+
{if {grid_field:text_column:length}}
294+
295+
{fluid:rte_field}
296+
{if '{content:has_excerpt}' == 'y'}<h1>Read More</h1>{/if}
297+
{/fluid:rte_field}
298+
284299
## Short Conditionals
285300

286301
Certain conditionals exist in a shortened form in order to improve template readability. These conditionals are usually checking to see if a certain thing is true or exists:

0 commit comments

Comments
 (0)