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. 2
      src/PageBundle/Resources/config/routing.yml
  5. 3
      src/ThemeBundle/Resources/config/routing.yml
  6. 5
      src/UserBundle/Resources/config/services.yml
  7. 19
      tests/behat/behat.yml

@ -47,7 +47,12 @@ services:
# Group voter, checks if a user has permissions to do actions
chamilo_course.security.authorization.voter.group_voter:
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
tags:
- { name: security.voter }

@ -1,12 +1,12 @@
faq_index:
path: /faq
defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null }
defaults: { _controller: 'ChamiloFaqBundle:Faq:index', categorySlug: null, questionSlug: null }
faq:
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.
faq_without_collapse:
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\:
resource: ../../Repository

@ -1,3 +1,3 @@
page:
resource: '@ChamiloPageBundle/Controller/PageController.php'
type: annotation
type: annotation

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

@ -2,4 +2,7 @@ services:
chamilo_user_provider:
class: Chamilo\UserBundle\Security\FOSUBUserProvider
#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}
]

@ -1,16 +1,15 @@
default:
extensions:
Behat\MinkExtension:
base_url: http://localhost
goutte: ~
show_cmd: 'open %s'
selenium2:
wd_host: "http://127.0.0.1:4444/wd/hub"
browser: chrome
default_session: selenium2
javascript_session: selenium2
files_path: "%paths.base%/../../web/"
base_url: http://localhost
goutte: ~
show_cmd: 'open %s'
selenium2:
wd_host: "http://127.0.0.1:4444/wd/hub"
browser: chrome
default_session: selenium2
javascript_session: selenium2
files_path: "%paths.base%/../../web/"
suites:
default:
paths: ["%paths.base%/features"]

Loading…
Cancel
Save