Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AdminBundle] Change admin template extends #1096

Merged
merged 1 commit into from
Apr 14, 2016

Conversation

dannyvw
Copy link
Contributor

@dannyvw dannyvw commented Apr 1, 2016

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Fixed tickets #683

The overriding of resources only works when you refer to resources with the @KunstmaanAdminBundle/Resources/views/Default/_js_header_extra.html.twig method. If you refer to resources without using the @BundleName shortcut, they can't be overridden in this way.

@dannyvw dannyvw force-pushed the bugfix/extends-admin-template branch from 9d67956 to feb9ef2 Compare April 1, 2016 13:11
@dannyvw dannyvw changed the title Change admin template extends [AdminBundle] Change admin template extends Apr 3, 2016
@dannyvw dannyvw force-pushed the bugfix/extends-admin-template branch from feb9ef2 to ba9e375 Compare April 4, 2016 06:54
@jockri jockri merged commit 5bfa303 into Kunstmaan:master Apr 14, 2016
@jockri jockri added this to the 3.5.2 milestone Apr 14, 2016
wouterv55 added a commit to wouterv55/KunstmaanBundlesCMS that referenced this pull request Apr 14, 2016
* master:
  fire service() method on Page in renderCustomSearchView() (Kunstmaan#1108)
  Update admin translations (Kunstmaan#1104)
  Fixed image cache path (Kunstmaan#1100)
  Move aviary js to own file (Kunstmaan#1099)
  Change admin template extends (Kunstmaan#1096)
jockri pushed a commit that referenced this pull request Apr 26, 2016
* master: (29 commits)
  [NodeBundle]: add group by clause for mysql 5.7 for symfony 2 (#1134)
  Implement clean deleted media command (#1127)
  [Global] Translation fix (#1115)
  Implement missing function (#1123)
  Fix #1120 bad reference to repository (#1122)
  [AdminBundle] Auto Google SignIn with Guard (#1119)
  Fix errors and improve documentation (#1118)
  Added delete confirmation modal when deleting images from media (#1110)
  Make remote thumbnails loading with relative protocol (#1114)
  Added button to clear content media folder (#1112)
  fire service() method on Page in renderCustomSearchView() (#1108)
  Update admin translations (#1104)
  Fixed image cache path (#1100)
  Move aviary js to own file (#1099)
  Change admin template extends (#1096)
  [GeneratorBundle]: change imagepagepart, url's are already absolute
  [GeneratorBundle] Spaceless fix
  Move twig extensions
  Cleanup code test
  Make admin menu translatable via existing translations
  ...
@dannyvw dannyvw deleted the bugfix/extends-admin-template branch May 31, 2016 08:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants