-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #953 from CatoTH/noref-fix-comment-caching
Noref fix comment caching
- Loading branch information
Showing
12 changed files
with
157 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?php | ||
|
|
||
| use app\models\db\{AmendmentComment, MotionComment}; | ||
| use yii\helpers\Html; | ||
|
|
||
| /** | ||
| * @var MotionComment[] $myMotionComments | ||
| * @var AmendmentComment[] $myAmendmentComments | ||
| */ | ||
|
|
||
| if (count($myMotionComments) === 0 && count($myAmendmentComments) === 0) { | ||
| return; | ||
| } | ||
|
|
||
| $motionComments = []; | ||
| foreach ($myMotionComments as $comment) { | ||
| if (!isset($motionComments[$comment->motionId])) { | ||
| $motionComments[$comment->motionId] = []; | ||
| } | ||
| if ($comment->paragraph === -1) { | ||
| $motionComments[$comment->motionId][] = $comment->text; | ||
| } else { | ||
| $motionComments[$comment->motionId][] = str_replace('%NO%', (string) $comment->paragraph, Yii::t('motion', 'private_notes_para')) . | ||
| ': ' . $comment->text; | ||
| } | ||
| } | ||
|
|
||
| $amendmentComments = []; | ||
| foreach ($myAmendmentComments as $comment) { | ||
| if (!isset($amendmentComments[$comment->amendmentId])) { | ||
| $amendmentComments[$comment->amendmentId] = []; | ||
| } | ||
| if ($comment->paragraph === -1) { | ||
| $amendmentComments[$comment->amendmentId][] = $comment->text; | ||
| } else { | ||
| $amendmentComments[$comment->amendmentId][] = str_replace('%NO%', (string) $comment->paragraph, Yii::t('motion', 'private_notes_para')) . | ||
| ': ' . $comment->text; | ||
| } | ||
| } | ||
|
|
||
| echo '<div class="hidden privateCommentList" data-antragsgruen-widget="frontend/MotionListPrivateComments">'; | ||
| foreach ($motionComments as $motionId => $commentTexts) { | ||
| $tooltip = Html::encode(implode(" - ", $commentTexts)); | ||
|
|
||
| echo '<a href="#" class="privateCommentsIndicator" data-target-type="motion" data-target-id="' . $motionId . '">'; | ||
| echo '<span class="glyphicon glyphicon-pushpin" data-toggle="tooltip" data-placement="right" ' . | ||
| 'aria-label="' . Html::encode(Yii::t('base', 'aria_tooltip')) . ': ' . $tooltip . '" ' . | ||
| 'data-original-title="' . $tooltip . '"></span>'; | ||
| echo '</a>'; | ||
| } | ||
|
|
||
| foreach ($amendmentComments as $amendmentId => $commentTexts) { | ||
| $tooltip = Html::encode(implode(" - ", $commentTexts)); | ||
|
|
||
| echo '<a href="#" class="privateCommentsIndicator" data-target-type="amendment" data-target-id="' . $amendmentId . '">'; | ||
| echo '<span class="glyphicon glyphicon-pushpin" data-toggle="tooltip" data-placement="right" ' . | ||
| 'aria-label="' . Html::encode(Yii::t('base', 'aria_tooltip')) . ': ' . $tooltip . '" ' . | ||
| 'data-original-title="' . $tooltip . '"></span>'; | ||
| echo '</a>'; | ||
| } | ||
| echo '</div>'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| export class MotionListPrivateComments { | ||
| constructor(private $element: JQuery) { | ||
| const holder = $element[0]; | ||
| holder.childNodes.forEach(comment => { | ||
| if (comment.nodeType !== Node.ELEMENT_NODE) { | ||
| return; | ||
| } | ||
| const commentNode = comment as HTMLElement; | ||
| const selector = '.' + commentNode.attributes['data-target-type'].value + 'Row' + commentNode.attributes['data-target-id'].value; | ||
| document.querySelectorAll(selector).forEach(motionRow => { | ||
| const commentHolder = motionRow.querySelector('.privateCommentHolder'); | ||
| if (!commentHolder) { | ||
| return; | ||
| } | ||
| const clonedComment = comment.cloneNode(true) as HTMLElement; | ||
| const link = motionRow.querySelector('.titleLink a'); | ||
| if (link) { | ||
| clonedComment.setAttribute('href', link.getAttribute('href')); | ||
| } | ||
|
|
||
| commentHolder.parentNode.insertBefore(clonedComment, commentHolder); | ||
| commentHolder.parentNode.removeChild(commentHolder); | ||
|
|
||
| $(clonedComment).find("[data-toggle=\"tooltip\"]").tooltip(); | ||
| }); | ||
| }); | ||
| } | ||
| } |