chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use id selectors for buttons in forum tool

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 10 years ago
parent 883ffe2c8e
commit 30605cb7a1
3 changed files with 90 additions and 59 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 66
      main/forum/viewthread_flat.inc.php
  2. 64
      main/forum/viewthread_nested.inc.php
  3. 19
      tests/features/forum.feature

66
main/forum/viewthread_flat.inc.php
Unescape View File

@ -62,27 +62,30 @@ if (isset($current_thread['thread_id'])) {
) {
if ($_user['user_id'] || ($current_forum['allow_anonymous'] == 1 && !$_user['user_id'])) {
if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
$buttonReply = Display::tag(
'a',
'<em class="fa fa-reply"></em> ' . get_lang('ReplyToMessage'),
array(
'href' => 'reply.php?' . api_get_cidreq()
. "&forum=$clean_forum_id&thread=$clean_thread_id&post="
. "{$row['post_id']}&action=replymessage&origin=$origin",
'class' => 'btn btn-primary'
)
$buttonReply = Display::toolbarButton(
get_lang('ReplyToMessage'),
'reply.php?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'post' => $row['post_id'],
'action' => 'replymessage'
]),
'reply',
'primary',
['id' => "reply-to-post-{$row['post_id']}"]
);
$buttonQuote = Display::tag(
'a',
'<em class="fa fa-quote-left"></em> ' . get_lang('QuoteMessage'),
array(
'href' => 'reply.php?' . api_get_cidreq()
. "&forum=$clean_forum_id&thread=$clean_thread_id"
. "&post={$row['post_id']}&action=quote&origin=$origin",
'class' => 'btn btn-success'
)
$buttonQuote = Display::toolbarButton(
get_lang('QuoteMessage'),
'reply.php?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'post' => $row['post_id'],
'action' => 'quote'
]),
'quote-left',
'success',
['id' => "quote-post-{$row['post_id']}"]
);
}
}
@ -188,14 +191,23 @@ if (isset($current_thread['thread_id'])) {
) {
if ($locked == false) {
$iconEdit .= "<a href=\"" . api_get_self() . "?" . api_get_cidreq() . "&forum="
. $clean_forum_id . "&thread=" . $clean_thread_id
. "&action=delete&content=post&id=" . $row['post_id'] . "&origin="
. $origin . "\" onclick=\"javascript:if(!confirm('"
. addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES))
. "')) return false;\">"
. Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)
. "</a>";
$deleteUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'action' => 'delete',
'content' => 'post',
'id' => $row['post_id']
]);
$iconEdit .= Display::url(
Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL),
$deleteUrl,
[
'onclick' => "javascript:if(!confirm('"
. addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES))
. "')) return false;",
'id' => "delete-post-{$row['post_id']}"
]
);
}
}
if (

64
main/forum/viewthread_nested.inc.php
Unescape View File

@ -138,12 +138,23 @@ foreach ($rows as $post) {
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId)
) {
if ($locked == false) {
$iconEdit .="<a href=\"" . api_get_self() . "?" . api_get_cidreq()
. "&forum=$clean_forum_id&thread=$clean_thread_id&action=delete&content=post&id={$post['post_id']}"
. "\" onclick=\"javascript:if(!confirm('"
. addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES)) . "')) return false;\">"
. Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)
. "</a>";
$deleteUrl = api_get_self() . '?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'action' => 'delete',
'content' => 'post',
'id' => $post['post_id']
]);
$iconEdit .= Display::url(
Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL),
$deleteUrl,
[
'onclick' => "javascript:if(!confirm('"
. addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES))
. "')) return false;",
'id' => "delete-post-{$post['post_id']}"
]
);
}
}
@ -206,27 +217,30 @@ foreach ($rows as $post) {
) {
if ($userId || ($current_forum['allow_anonymous'] == 1 && !$userId)) {
if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
$buttonReply = Display::tag(
'a',
'<em class="fa fa-reply"></em> ' . get_lang('ReplyToMessage'),
array(
'href' => 'reply.php?' . api_get_cidreq()
. "&forum=$clean_forum_id'&thread=$clean_thread_id"
. "&post={$post['post_id']}&action=replymessage&origin=$origin",
'class' => 'btn btn-primary'
)
$buttonReply = Display::toolbarButton(
get_lang('ReplyToMessage'),
'reply.php?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'post' => $post['post_id'],
'action' => 'replymessage'
]),
'reply',
'primary',
['id' => "reply-to-post-{$post['post_id']}"]
);
$buttonQuote = Display::tag(
'a',
'<em class="fa fa-quote-left"></em> ' . get_lang('QuoteMessage'),
array(
'href' => 'reply.php?' . api_get_cidreq()
. "&forum=$clean_forum_id&thread=$clean_thread_id"
. "&post={$post['post_id']}&action=quote&origin=$origin",
'class' => 'btn btn-success'
)
$buttonQuote = Display::toolbarButton(
get_lang('QuoteMessage'),
'reply.php?' . api_get_cidreq() . '&' . http_build_query([
'forum' => $clean_forum_id,
'thread' => $clean_thread_id,
'post' => $post['post_id'],
'action' => 'quote'
]),
'quote-left',
'success',
['id' => "quote-post-{$post['post_id']}"]
);
}
}

19
tests/features/forum.feature
Unescape View File

@ -31,17 +31,22 @@ Feature: Forum tool
Then I should see "The new thread has been added"
Scenario: Reply to forum message
Given I am on "/main/forum/reply.php?forum=1&thread=1&post=1&action=replymessage"
When I fill in the following:
Given I am on "/main/forum/viewthread.php?forum=1&thread=1"
When I follow "reply-to-1"
And I fill in the following:
| post_text | This is a reply to the first message for test |
And I press "SubmitPost"
Then I should see "The reply has been added"
Scenario: Delete a forum message
Given I am on "/main/forum/viewthread.php?forum=1&thread=1&action=delete&content=post&id=2"
Given I am on "/main/forum/viewthread.php?forum=1&thread=1"
When I follow "delete-post-2"
Then I should see "Post has been deleted"
Scenario: Quote a forum message
Given I am on "/main/forum/reply.php?forum=1&thread=1&post=1&action=quote"
When I press "SubmitPost"
Then I should see "The reply has been added"
# This test is commented because to quote a message is necessary load HTML code inside of textarea.
# And this breaks the page for Behat
# Scenario: Quote a forum message
# Given I am on "/main/forum/viewthread.php?forum=1&thread=1"
# When I follow "quote-1"
# And I press "SubmitPost"
# Then I should see "The reply has been added"
Write Preview
Loading…
Cancel
Save