Minor - flint fixes

pull/2650/head
Julio Montoya 7 years ago
parent 819fa762f3
commit fe92b23c4a
  1. 1
      main/auth/ldap/syncro_users.php
  2. 1
      main/dashboard/block.class.php
  3. 2
      main/exercise/hotspot_answers.as.php
  4. 4
      main/inc/lib/display.lib.php
  5. 2
      plugin/search_course/plugin.php
  6. 3
      src/CoreBundle/Controller/BaseController.php
  7. 1
      src/CoreBundle/Entity/CourseCategory.php
  8. 3
      src/CoreBundle/EventListener/CourseUploadListener.php
  9. 3
      src/CoreBundle/Form/Type/DocumentType.php
  10. 40
      src/CoreBundle/Form/Type/ResourceLinkType.php
  11. 4
      src/CoreBundle/Form/Type/ResourceNodeType.php
  12. 8
      src/CoreBundle/Form/Type/ResourceRightsType.php
  13. 3
      src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php
  14. 2
      src/CourseBundle/Controller/CourseControllerTrait.php
  15. 13
      src/CourseBundle/Entity/CDocument.php
  16. 1
      src/CourseBundle/Entity/CGroupCategory.php
  17. 1
      src/CourseBundle/Repository/CDocumentRepository.php

@ -1,6 +1,5 @@
<?php
require_once '../../inc/global.inc.php';
require_once 'authldap.php';

@ -36,6 +36,7 @@ class Block
).'\')) return false;" href="index.php?action=disable_block&path='.$this->path.'">
<em class="fa fa-times"></em>
</a>';
return $closeLink;
}

@ -97,7 +97,7 @@ if ($objExercise->selectResultsDisabled() == RESULT_DISABLE_SHOW_SCORE_ATTEMPT_S
$showResults = true;
if ($objExercise->attempts > 0) {
$lpId = $trackExerciseInfo['orig_lp_id'] ?? 0;
$lpItemId = $trackExerciseInfo['orig_lp_item_id'] ?? 0;
$lpItemId = $trackExerciseInfo['orig_lp_item_id'] ?? 0;
$attempts = Event::getExerciseResultsByUser(
api_get_user_id(),
$objExercise->id,

@ -1168,7 +1168,7 @@ class Display
'data-toggle' => 'tab',
'role' => 'tab',
'aria-controls' => 'aria_'.$id.$i,
'aria-selected' => $selected
'aria-selected' => $selected,
]
);
$lis .= $item;
@ -1298,7 +1298,7 @@ class Display
*
* @param string $div_id div id
* @param string $url url where the jqgrid will ask for data (if datatype = json)
* @param array $column_names Visible columns (you should use get_lang).
* @param array $column_names visible columns (you should use get_lang).
* An array in which we place the names of the columns.
* This is the text that appears in the head of the grid (Header layer).
* Example: colname {name:'date', index:'date', width:120, align:'right'},

@ -1,4 +1,4 @@
<?php
<?php
/**
* @copyright (c) 2011 University of Geneva
* @license GNU General Public License - http://www.gnu.org/copyleft/gpl.html

@ -5,10 +5,7 @@ namespace Chamilo\CoreBundle\Controller;
use Chamilo\CoreBundle\Entity\Course;
use Knp\Menu\FactoryInterface as MenuFactoryInterface;
use Knp\Menu\ItemInterface as MenuItemInterface;
use Knp\Menu\Renderer\ListRenderer;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Bundle\TwigBundle\TwigEngine;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
/**

@ -368,5 +368,4 @@ class CourseCategory
return $this;
}
}

@ -9,6 +9,7 @@ use Oneup\UploaderBundle\Uploader\File\FlysystemFile;
/**
* Class UploadListener.
*
* @package Chamilo\CoreBundle\EventListener
*/
class CourseUploadListener
@ -46,4 +47,4 @@ class CourseUploadListener
return $response;
}
}
}

@ -11,7 +11,8 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Class DocumentType
* Class DocumentType.
*
* @package Chamilo\CoreBundle\Form\Type
*/
class DocumentType extends AbstractType

@ -4,14 +4,14 @@
namespace Chamilo\CoreBundle\Form\Type;
use Chamilo\CoreBundle\Entity\ToolResourceRights;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* Class ResourceLinkType.
*
* @package Chamilo\CoreBundle\Form\Type
*/
class ResourceLinkType extends AbstractType
@ -25,40 +25,40 @@ class ResourceLinkType extends AbstractType
->add(
'sharing',
ChoiceType::class,
array(
'choices' => array(
[
'choices' => [
'everyone' => 'Everyone',
'course' => 'Course',
'user' => 'User',
'group' => 'Group',
),
'attr' => array('class' => 'sharing_options'),
'mapped' => false
)
],
'attr' => ['class' => 'sharing_options'],
'mapped' => false,
]
)
->add(
'search',
'hidden',
array(
'attr' => array('class' => 'extra_hidden'),
'mapped' => false
)
[
'attr' => ['class' => 'extra_hidden'],
'mapped' => false,
]
)
->add(
'role',
ChoiceType::class,
array(
[
'choices' => ToolResourceRights::getDefaultRoles(),
'mapped' => false
)
'mapped' => false,
]
)
->add(
'mask',
ChoiceType::class,
array(
[
'choices' => ToolResourceRights::getMaskList(),
'mapped' => false
)
'mapped' => false,
]
)/*->add(
'rights',
'collection',
@ -76,9 +76,9 @@ class ResourceLinkType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
array(
[
'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceLink',
)
]
);
}

@ -36,9 +36,9 @@ class ResourceNodeType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
array(
[
'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceNode',
)
]
);
}

@ -24,12 +24,12 @@ class ResourceRightsType extends AbstractType
->add(
'role',
'choice',
array('choices' => ToolResourceRights::getDefaultRoles())
['choices' => ToolResourceRights::getDefaultRoles()]
)
->add(
'mask',
'choice',
array('choices' => ToolResourceRights::getMaskList())
['choices' => ToolResourceRights::getMaskList()]
);
}
@ -39,9 +39,9 @@ class ResourceRightsType extends AbstractType
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(
array(
[
'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceRights',
)
]
);
}

@ -7,7 +7,6 @@ use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
use Chamilo\CoreBundle\Entity\Session;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\Security\Acl\Permission\MaskBuilder;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
@ -123,7 +122,6 @@ class ResourceNodeVoter extends Voter
if ($creator instanceof UserInterface &&
$user->getUsername() === $creator->getUsername()) {
return true;
}
@ -256,7 +254,6 @@ class ResourceNodeVoter extends Voter
foreach ($user->getRoles() as $role) {
if ($acl->isAllowed($role, $resource, $askedMask)) {
//dump('passed');
return true;
}

@ -8,7 +8,7 @@ use Chamilo\CoreBundle\Entity\Session;
/**
* Trait CourseControllerTrait.
* Implements the functions defined by the CourseControllerInterface
* Implements the functions defined by the CourseControllerInterface.
*
* @package Chamilo\CourseBundle\Controller
*/

@ -3,13 +3,13 @@
namespace Chamilo\CourseBundle\Entity;
use APY\DataGridBundle\Grid\Mapping as GRID;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
use Chamilo\CoreBundle\Entity\Resource\ResourceInterface;
use Chamilo\CoreBundle\Entity\Session;
use Doctrine\ORM\Mapping as ORM;
use APY\DataGridBundle\Grid\Mapping as GRID;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Mapping as ORM;
/**
* CDocument.
@ -103,6 +103,10 @@ class CDocument extends AbstractResource implements ResourceInterface
{
}
public function __get($a)
{
}
/**
* Set path.
*
@ -323,7 +327,6 @@ class CDocument extends AbstractResource implements ResourceInterface
* @ORM\PostPersist()
*
* @param LifecycleEventArgs $args
*
*/
public function postPersist(LifecycleEventArgs $args)
{
@ -350,8 +353,4 @@ class CDocument extends AbstractResource implements ResourceInterface
{
return 'document';
}
public function __get($a) {
}
}

@ -576,5 +576,4 @@ class CGroupCategory
return $this;
}
}

@ -12,5 +12,4 @@ use Chamilo\CoreBundle\Repository\ResourceRepository;
*/
class CDocumentRepository extends ResourceRepository
{
}

Loading…
Cancel
Save