Merge pull request #874 from BitBangersCode/templates-fix

Add custom templates to /api/get_templates_listing

src/routes/api.js

@@ -24,7 +24,9 @@ var path = require('path'),
 		app.namespace('/api', function () {
 			app.get('/get_templates_listing', function (req, res) {
 				utils.walk(path.join(__dirname, '../../', 'public/templates'), function (err, data) {
-					res.json(data);
+					res.json(data.concat(app.get_custom_templates()).filter(function(value, index, self) {
+						return self.indexOf(value) === index;
+					}));
 				});
 			});
 

src/webserver.js

@@ -911,6 +911,12 @@ module.exports.server = server;
 			'templates': []
 		};
 
+		app.get_custom_templates = function() {
+			return custom_routes.templates.map(function(tpl) {
+				return tpl.template.split('.tpl')[0];
+			});
+		}
+
 		plugins.ready(function() {
 			plugins.fireHook('filter:server.create_routes', custom_routes, function(err, custom_routes) {
 				var routes = custom_routes.routes;