From 5306ac24be95b2538c821cd2674bd46c89fdaccd Mon Sep 17 00:00:00 2001 From: Robert Freigang Date: Tue, 24 Feb 2015 09:04:10 +0100 Subject: [PATCH 1/2] add note about adding empty directories to git Git won't add empty directories but to take template override into account there is at least one of [Doctrine, DoctrineODM, Propel] needed. also see: https://github.com/symfony2admingenerator/AdmingeneratorGeneratorBundle/issues/789 --- Resources/doc/cookbook/extending-generator-templates.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/doc/cookbook/extending-generator-templates.md b/Resources/doc/cookbook/extending-generator-templates.md index 2c4e84ad..05bfad64 100644 --- a/Resources/doc/cookbook/extending-generator-templates.md +++ b/Resources/doc/cookbook/extending-generator-templates.md @@ -16,7 +16,8 @@ admingenerator_generator: 2. Keep in mind that you will at least need **one dir** in the previous specified template directory, namely of the DBAL layer used, so one of [Doctrine, DoctrineODM, Propel]. Without this directory, the specified template directory will not be used for extending/overwriting any of the templates, even in the CommonAdmin dir. +Note: If you are using git and your directory is empty you will [need to add a .gitignore file to add this directory to git](https://git.wiki.kernel.org/index.php/GitFaq#Can_I_add_empty_directories.3F). 3. Be free to extend/overwrite any template in the Resources/templates dir of the AdminGenerator! -Please note that your own templates might need adjustment when new releases of the AdminGenerator arrive. So if anything breaks after a update and you're using custom templates, please check those first! \ No newline at end of file +Please note that your own templates might need adjustment when new releases of the AdminGenerator arrive. So if anything breaks after a update and you're using custom templates, please check those first! From c708b6b5578a575c92431f0f43b49d9f255065a7 Mon Sep 17 00:00:00 2001 From: Robert Freigang Date: Tue, 24 Feb 2015 10:31:56 +0100 Subject: [PATCH 2/2] .gitkeep instead of .gitignore for empty folders --- Resources/doc/cookbook/extending-generator-templates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/doc/cookbook/extending-generator-templates.md b/Resources/doc/cookbook/extending-generator-templates.md index 05bfad64..683e3b49 100644 --- a/Resources/doc/cookbook/extending-generator-templates.md +++ b/Resources/doc/cookbook/extending-generator-templates.md @@ -16,7 +16,7 @@ admingenerator_generator: 2. Keep in mind that you will at least need **one dir** in the previous specified template directory, namely of the DBAL layer used, so one of [Doctrine, DoctrineODM, Propel]. Without this directory, the specified template directory will not be used for extending/overwriting any of the templates, even in the CommonAdmin dir. -Note: If you are using git and your directory is empty you will [need to add a .gitignore file to add this directory to git](https://git.wiki.kernel.org/index.php/GitFaq#Can_I_add_empty_directories.3F). +Note: If you are using git and your directory is empty you will [need to add least one file to add this directory to git](https://git.wiki.kernel.org/index.php/GitFaq#Can_I_add_empty_directories.3F). It's convention to add a .gitkeep file. 3. Be free to extend/overwrite any template in the Resources/templates dir of the AdminGenerator!