Merge pull request #122 from NoumbissiValere/issue/121

Issue/121

.travis.yml

@@ -18,6 +18,7 @@ matrix:
 branches:
   only:
     - master
+    - gsoc2019
 
 before_install:
   - pip install -U pip wheel setuptools

django_netjsonconfig/api/generics.py

@@ -10,7 +10,7 @@ class BaseSearchTemplate(ListAPIView):
     def get_queryset(self):
         name = self.request.GET.get('name', None)
         des = self.request.GET.get('des', None)
-        temp = self.template_model.filter(sharing='public')
+        temp = self.template_model.objects.filter(sharing='public')
         if name and des is None:
             temp = temp.filter(name__icontains=name)
         elif des and name is None:

django_netjsonconfig/static/django-netjsonconfig/js/widget.js

@@ -68,18 +68,18 @@
     };
 
     var evaluateVars = function(data, context){
-        var pattern = new RegExp('\{\{.*?\}\}');
+        var pattern = /^\{\{\s*(\w*)\s*\}\}$/g;
         if (typeof data === 'object'){
-            for (var [key, value] of Object.entries(data)){
-                data[key] = evaluateVars(value, context);
-            }
+            Object.keys(data).forEach(function(key) {
+                data[key] = evaluateVars(data[key], context);
+            });
         }
         if (typeof data === 'string') {
             var found_vars = data.match(pattern);
-            if (found_vars != null){
+            if (found_vars !== null){
                 found_vars.forEach(function(element) {
                     element = element.replace(/^\{\{\s+|\s+\}\}$|^\{\{|\}\}$/g, '');
-                    if (element in context){
+                    if (context.hasOwnProperty(element)){
                         data = data.replace(pattern, context[element]);
                     }
                 });