From a53826f46d7391cf9239d962c9b8ac0dcaec84fd Mon Sep 17 00:00:00 2001 From: Celestora Date: Wed, 13 Oct 2021 21:47:42 +0300 Subject: [PATCH] Wall: Move comments script from Post view to general comments template --- Web/Presenters/templates/Wall/Post.xml | 4 ---- Web/Presenters/templates/components/comments.xml | 2 ++ Web/Presenters/templates/components/textArea.xml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml index 433d1775..4699c491 100644 --- a/Web/Presenters/templates/Wall/Post.xml +++ b/Web/Presenters/templates/Wall/Post.xml @@ -34,7 +34,3 @@ {_report} {/block} - -{block bodyScripts} - {script "js/al_comments.js"} -{/block} diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml index 961ba376..2776a7aa 100644 --- a/Web/Presenters/templates/components/comments.xml +++ b/Web/Presenters/templates/components/comments.xml @@ -24,3 +24,5 @@ {/if} --> {_"comments_tip"} {/if} + +{script "js/al_comments.js"} diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml index 3aed19b8..6f55b579 100644 --- a/Web/Presenters/templates/components/textArea.xml +++ b/Web/Presenters/templates/components/textArea.xml @@ -9,7 +9,7 @@ Вложение: (unknown)
- {if !is_null($thisUser) && !is_null($club) && $owner < 0} + {if !is_null($thisUser) && !is_null($club ?? NULL) && $owner < 0} {if $club->canBeModifiedBy($thisUser)}