Rename entity MessageLikes to MessageFeedback

See 9af667f5af
pull/2874/head
Angel Fernando Quiroz Campos 7 years ago
parent e2eda96358
commit 9c5371b448
  1. 8
      main/inc/ajax/social.ajax.php
  2. 8
      main/inc/lib/message.lib.php
  3. 12
      main/install/configuration.dist.php
  4. 2
      main/template/default/layout/main.js.tpl
  5. 4
      src/Chamilo/CoreBundle/Entity/Message.php
  6. 22
      src/Chamilo/CoreBundle/Entity/MessageFeedback.php

@ -2,7 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CoreBundle\Entity\Message;
use Chamilo\CoreBundle\Entity\MessageLikes;
use Chamilo\CoreBundle\Entity\MessageFeedback;
use ChamiloSession as Session;
/**
@ -339,7 +339,7 @@ switch ($action) {
if (
api_is_anonymous() ||
!api_get_configuration_value('social_enable_likes_messages')
!api_get_configuration_value('social_enable_messages_feedback')
) {
echo json_encode(false);
exit;
@ -356,7 +356,7 @@ switch ($action) {
$em = Database::getManager();
$messageRepo = $em->getRepository('ChamiloCoreBundle:Message');
$messageLikesRepo = $em->getRepository('ChamiloCoreBundle:MessageLikes');
$messageLikesRepo = $em->getRepository('MessageFeedback');
/** @var Message $message */
$message = $messageRepo->find($messageId);
@ -393,7 +393,7 @@ switch ($action) {
$userLike = $messageLikesRepo->findOneBy(['message' => $message, 'user' => $user]);
if (empty($userLike)) {
$userLike = new MessageLikes();
$userLike = new MessageFeedback();
$userLike
->setMessage($message)
->setUser($user);

@ -2740,7 +2740,7 @@ class MessageManager
*/
public static function countLikesAndDislikes($messageId, $userId)
{
if (!api_get_configuration_value('social_enable_likes_messages')) {
if (!api_get_configuration_value('social_enable_messages_feedback')) {
return [];
}
@ -2750,7 +2750,7 @@ class MessageManager
$em = Database::getManager();
$query = $em
->createQuery('
SELECT SUM(l.liked) AS likes, SUM(l.disliked) AS dislikes FROM ChamiloCoreBundle:MessageLikes l
SELECT SUM(l.liked) AS likes, SUM(l.disliked) AS dislikes FROM ChamiloCoreBundle:MessageFeedback l
WHERE l.message = :message
')
->setParameters(['message' => $messageId]);
@ -2762,7 +2762,7 @@ class MessageManager
}
$userLike = $em
->getRepository('ChamiloCoreBundle:MessageLikes')
->getRepository('MessageFeedback')
->findOneBy(['message' => $messageId, 'user' => $userId]);
return [
@ -2782,7 +2782,7 @@ class MessageManager
*/
public static function getLikesButton($messageId, $userId, $groupId = 0)
{
if (!api_get_configuration_value('social_enable_likes_messages')) {
if (!api_get_configuration_value('social_enable_messages_feedback')) {
return '';
}

@ -1151,17 +1151,17 @@ ALTER TABLE gradebook_evaluation ADD score_weight DOUBLE PRECISION DEFAULT NULL,
// Avoid add a reply-to header when a no-reply address is set.
//$_configuration['mail_no_reply_avoid_reply_to'] = false;
// Allows to user add likes or dislikes to posts in social wall. Requires DB changes:
// CREATE TABLE message_likes (id BIGINT AUTO_INCREMENT NOT NULL, message_id BIGINT NOT NULL, user_id INT NOT NULL, liked TINYINT(1) DEFAULT '0' NOT NULL, disliked TINYINT(1) DEFAULT '0' NOT NULL, updated_at DATETIME NOT NULL, INDEX IDX_B66CB196537A1329 (message_id), INDEX IDX_B66CB196A76ED395 (user_id), INDEX idx_message_likes_uid_mid (message_id, user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
// ALTER TABLE message_likes ADD CONSTRAINT FK_B66CB196537A1329 FOREIGN KEY (message_id) REFERENCES message (id) ON DELETE CASCADE;
// ALTER TABLE message_likes ADD CONSTRAINT FK_B66CB196A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE;
// Allows to user add feedback (likes or dislikes) to posts in social wall. Requires DB changes:
// CREATE TABLE message_feedback (id BIGINT AUTO_INCREMENT NOT NULL, message_id BIGINT NOT NULL, user_id INT NOT NULL, liked TINYINT(1) DEFAULT '0' NOT NULL, disliked TINYINT(1) DEFAULT '0' NOT NULL, updated_at DATETIME NOT NULL, INDEX IDX_DB0F8049537A1329 (message_id), INDEX IDX_DB0F8049A76ED395 (user_id), INDEX idx_message_feedback_uid_mid (message_id, user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
// ALTER TABLE message_feedback ADD CONSTRAINT FK_DB0F8049537A1329 FOREIGN KEY (message_id) REFERENCES message (id) ON DELETE CASCADE;
// ALTER TABLE message_feedback ADD CONSTRAINT FK_DB0F8049A76ED395 FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE;
// In 1.11.8, before enabling this feature, you also need to:
// - edit src/Chamilo/CoreBundle/Entity/MessageLikes.php
// - edit src/Chamilo/CoreBundle/Entity/MessageFeedback.php
// and follow the instructions about the @ORM\Entity() line
// - edit src/Chamilo/CoreBundle/Entity/Message.php
// and fllow the instruccions about the @ORM\OneToMany line for the $likes property
// - launch composer install to rebuild the autoload.php
//$_configuration['social_enable_likes_messages'] = false;
//$_configuration['social_enable_messages_feedback'] = false;
// Block student's access to the course documents when using the ckeditor "Browse server" button
//$_configuration['block_editor_file_manager_for_students'] = false;

@ -325,7 +325,7 @@ $(function() {
$('video:not(.skip)').attr('preload', 'metadata');
function socialLikes() {
{% if 'social_enable_likes_messages'|api_get_configuration_value %}
{% if 'social_enable_messages_feedback'|api_get_configuration_value %}
$('body').on('click', '.social-like', function (e) {
e.preventDefault();

@ -103,8 +103,8 @@ class Message
/**
* @var ArrayCollection
*
* Add @ to the next line if api_get_configuration_value('social_enable_likes_messages') is true
* ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\MessageLikes", mappedBy="message", orphanRemoval=true)
* Add @ to the next line if api_get_configuration_value('social_enable_messages_feedback') is true
* ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\MessageFeedback", mappedBy="message", orphanRemoval=true)
*/
protected $likes;

@ -8,20 +8,20 @@ use Doctrine\ORM\Mapping as ORM;
use Doctrine\ORM\Mapping\Index;
/**
* Class MessageLikes.
* Class MessageFeedback.
*
* @package Chamilo\CoreBundle\Entity
*
* @ORM\Table(
* name="message_likes",
* name="message_feedback",
* indexes={
* @Index(name="idx_message_likes_uid_mid", columns={"message_id", "user_id"})
* @Index(name="idx_message_feedback_uid_mid", columns={"message_id", "user_id"})
* }
* )
* Add @ to the next line if api_get_configuration_value('social_enable_likes_messages') is true
* Add @ to the next line if api_get_configuration_value('social_enable_messages_feedback') is true
* ORM\Entity()
*/
class MessageLikes
class MessageFeedback
{
/**
* @var int
@ -75,7 +75,7 @@ class MessageLikes
/**
* @param int $id
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setId($id)
{
@ -95,7 +95,7 @@ class MessageLikes
/**
* @param Message $message
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setMessage(Message $message)
{
@ -115,7 +115,7 @@ class MessageLikes
/**
* @param User $user
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setUser(User $user)
{
@ -135,7 +135,7 @@ class MessageLikes
/**
* @param bool $liked
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setLiked($liked)
{
@ -155,7 +155,7 @@ class MessageLikes
/**
* @param bool $disliked
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setDisliked($disliked)
{
@ -175,7 +175,7 @@ class MessageLikes
/**
* @param \DateTime $updatedAt
*
* @return MessageLikes
* @return MessageFeedback
*/
public function setUpdatedAt(\DateTime $updatedAt)
{
Loading…
Cancel
Save