pull/2487/head
jmontoyaa 7 years ago
parent 14bbf1ec3d
commit 43740839eb
  1. 7
      src/CourseBundle/Resources/config/services.yml
  2. 6
      src/FaqBundle/Resources/config/routing.yml
  3. 1
      src/FaqBundle/Resources/config/services.yml
  4. 3
      src/ThemeBundle/Resources/config/routing.yml
  5. 5
      src/UserBundle/Resources/config/services.yml
  6. 1
      tests/behat/behat.yml

@ -47,7 +47,12 @@ services:
# Group voter, checks if a user has permissions to do actions # Group voter, checks if a user has permissions to do actions
chamilo_course.security.authorization.voter.group_voter: chamilo_course.security.authorization.voter.group_voter:
class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter
arguments: [ '@doctrine.orm.entity_manager', '@chamilo_core.entity.manager.course_manager', '@chamilo_course.manager.group', '@service_container' ] arguments: [
'@doctrine.orm.entity_manager',
'@chamilo_core.entity.manager.course_manager',
'@chamilo_course.manager.group',
'@service_container'
]
public: false public: false
tags: tags:
- { name: security.voter } - { name: security.voter }

@ -1,12 +1,12 @@
faq_index: faq_index:
path: /faq path: /faq
defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null } defaults: { _controller: 'ChamiloFaqBundle:Faq:index', categorySlug: null, questionSlug: null }
faq: faq:
path: /faq/{categorySlug}/{questionSlug} path: /faq/{categorySlug}/{questionSlug}
defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null } defaults: { _controller: 'ChamiloFaqBundle:Faq:index', categorySlug: null, questionSlug: null }
# Shows the entire FAQ at once, without collapsing any categories or questions. Useful if your FAQ is not that big. # Shows the entire FAQ at once, without collapsing any categories or questions. Useful if your FAQ is not that big.
faq_without_collapse: faq_without_collapse:
path: /faq-without-collapse/{categorySlug} path: /faq-without-collapse/{categorySlug}
defaults: { _controller: ChamiloFaqBundle:Faq:indexWithoutCollapse, categorySlug: null } defaults: { _controller: 'ChamiloFaqBundle:Faq:indexWithoutCollapse', categorySlug: null }

@ -4,4 +4,3 @@ services:
Chamilo\FaqBundle\Repository\: Chamilo\FaqBundle\Repository\:
resource: ../../Repository resource: ../../Repository

@ -1,5 +1,6 @@
login: login:
path: /login path: /login
defaults: { _controller: ChamiloThemeBundle:Security:login } defaults: { _controller: 'ChamiloThemeBundle:Security:login' }
login_check: login_check:
path: /login_check path: /login_check

@ -2,4 +2,7 @@ services:
chamilo_user_provider: chamilo_user_provider:
class: Chamilo\UserBundle\Security\FOSUBUserProvider class: Chamilo\UserBundle\Security\FOSUBUserProvider
#this is the place where the properties are passed to the UserProvider - see config.yml #this is the place where the properties are passed to the UserProvider - see config.yml
arguments: ['@sonata.user.orm.user_manager', {facebook: facebookId, google: googleId, github: githubId} ] arguments: [
'@sonata.user.orm.user_manager',
{facebook: facebookId, google: googleId, github: githubId}
]

@ -10,7 +10,6 @@ default:
default_session: selenium2 default_session: selenium2
javascript_session: selenium2 javascript_session: selenium2
files_path: "%paths.base%/../../web/" files_path: "%paths.base%/../../web/"
suites: suites:
default: default:
paths: ["%paths.base%/features"] paths: ["%paths.base%/features"]

Loading…
Cancel
Save