Skip to content

Commit

Permalink
Merge branch 'release/0.37.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwenzel
dwenzel committed Oct 25, 2017
2 parents 30e5ab5 + b306c07 commit 57e4293
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 75 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2017-10-25 [RELEASE] Release of t3events 0.37.2 (Dirk Wenzel)
2017-10-25 7d32b4e [BUGFIX] fixed error in Be/EditRecordViewHelper which prevented from setting return URL for module correctly (TYPO3 Version 8). Templates adapted. Please make sure to adapt your custom templates for backend list views. (Dirk Wenzel)

2017-10-05 [RELEASE] Release of t3events 0.37.1 (Dirk Wenzel)
2017-09-29 204f32a [BUGFIX] fixed error in plugin configuration which prevented from unselecting caching of calendar widget (Dirk Wenzel)
2017-09-27 ccb1f27 [TASK] Add ContentRepository. (Erik Rauchstein)
Expand Down
5 changes: 3 additions & 2 deletions Classes/ViewHelpers/Be/EditRecordViewHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ public static function renderStatic(
) {
$parameters = GeneralUtility::explodeUrl2Array($arguments['parameters']);

$parameters['returnUrl'] = 'index.php?M='. $arguments['moduleName'] . '&id=' . (int)GeneralUtility::_GET('id')
. '&moduleToken=' . FormProtectionFactory::get()->generateToken('moduleCall', $arguments['moduleName']);
$parameters['returnUrl'] = 'index.php?M='. $parameters['moduleName'] . '&id=' . (int)GeneralUtility::_GET('id')
. '&moduleToken=' . FormProtectionFactory::get()->generateToken('moduleCall', $parameters['moduleName']);

unset($parameters['moduleName']);
return BackendUtility::getModuleUrl('record_edit', $parameters);
}
}
46 changes: 13 additions & 33 deletions Resources/Private/Templates/Backend/Event/List.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,42 +42,22 @@ <h1>{f:translate(key: 'header.events')}</h1>
<tr class="db_list_normal">
<td nowrap="nowrap">{event.uid}</td>
<td nowrap="nowrap">
<f:if condition="{f:cObject(typoscriptObjectPath: 'lib.compatVersion76')}">
<f:then>
<a href="#" class="t3-js-clickmenutrigger"
data-table="tx_t3events_domain_model_event" data-uid="{event.uid}"
data-listframe="0">
{event.headline}
</a>
</f:then>
<f:else>
<a href="" title="edit"
onclick="window.location.href='alt_doc.php?returnUrl='+T3_THIS_LOCATION+'&edit[tx_t3events_domain_model_event][{event.uid}]=edit'; return false;">
{event.headline}
</a>
</f:else>
</f:if>
<a href="#" class="t3-js-clickmenutrigger"
data-table="tx_t3events_domain_model_event" data-uid="{event.uid}"
data-listframe="0">
{event.headline}
</a>
</td>
<td nowrap="nowrap" class="col-control">
<f:if condition="{f:cObject(typoscriptObjectPath: 'lib.compatVersion76')}">
<f:then>
<div class="btn btn-default">
<!--suppress HtmlUnknownTarget -->
<a
class="actions-open"
title="UID: {event.uid}"
href="{ts:be.editRecord(parameters:'edit[tx_t3events_domain_model_event][{event.uid}]=edit')}"
>{f:translate(key: 'button.edit', default: 'button.edit')}</a>
</div>
</f:then>
<f:else>
<a href="#"
onclick="window.location.href='alt_doc.php?returnUrl='+T3_THIS_LOCATION+'&edit[tx_t3events_domain_model_event][{event.uid}]=edit'; return false;">
{f:translate(key: 'button.edit', default: 'button.edit')}
</a>
<div class="btn btn-default">
<!--suppress HtmlUnknownTarget -->
<a
class="actions-open"
title="UID: {event.uid}"
href="{ts:be.editRecord(parameters:'edit[tx_t3events_domain_model_event][{event.uid}]=edit&moduleName=Events_T3eventsM1')}"
>{f:translate(key: 'button.edit', default: 'button.edit')}</a>
</div>

</f:else>
</f:if>
</td>
<td nowrap="nowrap">{event.eventType.title}</td>
<td nowrap="nowrap">
Expand Down
53 changes: 16 additions & 37 deletions Resources/Private/Templates/Backend/Schedule/List.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<f:comment>Content</f:comment>
<f:section name="main">
<f:comment>
<f:debug inline="true">{filterOptions}</f:debug>
<f:debug inline="true">{performances}</f:debug>
<f:debug>{filterOptions}</f:debug>
<f:debug>{performances}</f:debug>
</f:comment>
<h1>{f:translate(key: 'header.schedules')}</h1>

Expand Down Expand Up @@ -44,46 +44,25 @@ <h1>{f:translate(key: 'header.schedules')}</h1>
<f:format.date format="d.m.Y">{schedule.date}</f:format.date>
</td>
<td nowrap="nowrap">
<f:if condition="{f:cObject(typoscriptObjectPath: 'lib.compatVersion76')}">
<f:then>
<a href="#" class="t3-js-clickmenutrigger"
data-table="tx_t3events_domain_model_performance"
data-uid="{schedule.uid}"
data-listframe="0">
{schedule.event.headline}
</a>
</f:then>
<f:else>
<a href="" title="edit"
onclick="window.location.href='alt_doc.php?returnUrl='+T3_THIS_LOCATION+'&edit[tx_t3events_domain_model_performance][{schedule.uid}]=edit'; return false;">
{schedule.event.headline}
</a>
</f:else>
</f:if>
<a href="#" class="t3-js-clickmenutrigger"
data-table="tx_t3events_domain_model_performance"
data-uid="{schedule.uid}"
data-listframe="0">
{schedule.event.headline}
</a>
</td>
<td nowrap="nowrap">{schedule.eventLocation.name}</td>
<td nowrap="nowrap">{schedule.event.eventType.title}</td>
<td nowrap="nowrap">{schedule.status.title}</td>
<td nowrap="nowrap">
<f:if condition="{f:cObject(typoscriptObjectPath: 'lib.compatVersion76')}">
<f:then>
<div class="btn btn-default">
<!--suppress HtmlUnknownTarget -->
<a
class="actions-open"
title="UID: {schedule.uid}"
href="{ts:be.editRecord(parameters:'edit[tx_t3events_domain_model_performance][{schedule.uid}]=edit')}"
>{f:translate(key: 'button.edit', default: 'button.edit)}</a>
</div>
</f:then>
<f:else>
<a href=""
onclick="window.location.href='alt_doc.php?returnUrl='+T3_THIS_LOCATION+'&edit[tx_t3events_domain_model_performance][{schedule.uid}]=edit'; return false;">
{f:translate(key: 'button.edit', default: 'button.edit)}
</a>

</f:else>
</f:if>
<div class="btn btn-default">
<!--suppress HtmlUnknownTarget -->
<a
class="actions-open"
title="UID: {schedule.uid}"
href="{ts:be.editRecord(parameters:'edit[tx_t3events_domain_model_performance][{schedule.uid}]=edit&moduleName=Events_T3eventsM2')}"
>{f:translate(key: 'button.edit', default: 'button.edit)}</a>
</div>
</td>
</tr>
</f:for>
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
View file

Large diffs are not rendered by default.

0 comments on commit 57e4293

Please sign in to comment.