Fixing bugs related to running fab

fabric-bolt · Mar 3, 2014 · ebfb22d · ebfb22d
1 parent 8888f4d
commit ebfb22d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/fabric_bolt/core/views.py b/fabric_bolt/core/views.py
@@ -40,7 +40,7 @@ def get_context_data(self, **kwargs):
         if len(deploys) == 0:
             return context
 
-        projects = list(Project.objects.all())
+        projects = list(Project.active_records.all())
         if len(projects) == 0:
             return context
 

diff --git a/fabric_bolt/projects/sockets.py b/fabric_bolt/projects/sockets.py
@@ -72,10 +72,11 @@ def get_key_value_string(key, value):
             elif isinstance(value, float):
                 return key + '=' + str(value)
             else:
-                return '{}="{}"'.format(key, value.replace('"', '\\"'))
+                return '{}={}'.format(key, value.replace('"', '\\"'))
 
         if normal_options:
-            command.append('--set ' + ','.join(get_key_value_string(key, config[key]) for key in normal_options))
+            command.append('--set')
+            command.append(','.join(get_key_value_string(key, config[key]) for key in normal_options))
 
         if special_options:
             for key in special_options:

diff --git a/fabric_bolt/projects/views.py b/fabric_bolt/projects/views.py
@@ -130,7 +130,7 @@ class ProjectDetail(DetailView):
     model = models.Project
 
     def dispatch(self, request, *args, **kwargs):
-        if request.user.user_is_historian:
+        if request.user.user_is_historian():
             self.template_name = "projects/historian_detail.html"
 
         return super(ProjectDetail, self).dispatch(request, *args, **kwargs)
@@ -387,17 +387,20 @@ def get_key_value_string(key, value):
             elif isinstance(value, float):
                 return key + '=' + str(value)
             else:
-                return '{}="{}"'.format(key, value.replace('"', '\\"'))
+                return '{}={}'.format(key, value.replace('"', '\\"'))
 
         if normal_options:
-            command.append('--set ' + ','.join(get_key_value_string(key, config[key]) for key in normal_options))
+            command.append('--set')
+            command.append(','.join(get_key_value_string(key, config[key]) for key in normal_options))
 
         if special_options:
             for key in special_options:
                 command.append('--' + get_key_value_string(command_to_config[key], config[key]))
 
         command.append('--fabfile={}'.format(get_fabfile_path(self.object.stage.project)))
 
+        print command
+
         return command
 
     def output_stream_generator(self):