Merge pull request #93 from tinyclues/90-fix

Fix non-supported syntax in python2.6 in string formatting. Fix #90

saltpad/app.py

@@ -177,12 +177,14 @@ def job_result(jid):
     renderer = request.args.get('renderer', 'raw')
     job = client.job(jid)
 
+    context = {}
+
     if renderer == 'highstate':
         try:
             job = parse_highstate(job)
         except NotHighstateOutput:
             return redirect(url_for('job_result', jid=jid, minion=minion,
-                renderer='raw'))
+                            renderer='raw'))
     elif renderer == 'aggregate':
         aggregate_result = {}
 
@@ -192,12 +194,13 @@ def job_result(jid):
         missing_minions = set(job['info']['Minions']) - set(job['return'].keys())
         if missing_minions:
             aggregate_result['Missing results'] = missing_minions
-        job['return'] = aggregate_result
+        job['aggregate_return'] = aggregate_result
+        context['total_minions'] = sum(len(minions) for minions in aggregate_result.values())
 
     if not job:
         return "Unknown jid", 404
     return render_template('job_result_{0}.html'.format(renderer), job=job, minion=minion,
-        renderer=renderer)
+                           renderer=renderer, **context)
 
 @app.route("/templates")
 @login_required

saltpad/templates/job_result_aggregate.html

@@ -2,20 +2,18 @@
 
 {% block job_result %}
 
-{% set total_minions_length = job.info.Minions|length %}
-
 <div class="row">
   <div class="col-lg-12">
     <p>
         <button class="btn btn-primary btn-sm" id="expand-all"><i class="fa fa-sitemap"></i> Expand all</button>
     </p>
   </div>
-{% for result, minions in job.return|aggregate_len_sort %}
+{% for result, minions in job.aggregate_return|aggregate_len_sort %}
 
   <div class="col-lg-12">
       <div class="panel panel-default">
         <div class="panel-heading">
-          <h3>{{hiding_control('hide_control_minion', True)|safe }} {{ minions|length }} ({{ '{:.0%}'.format(minions|length / total_minions_length) }}) minion(s) with this result:</h3>
+          <h3>{{hiding_control('hide_control_minion', True)|safe }} {{ minions|length }} ({{ '{0:.0%}'.format(minions|length / total_minions) }}) minion(s) with this result:</h3>
         </div>
         <pre class="panel-body">{{ result }}</pre>
         <ul class="list-group" style="display: none">

saltpad/utils.py

@@ -190,7 +190,7 @@ def format_arguments(arguments):
     for argument in arguments:
         if isinstance(argument, dict):
             argument.pop('__kwarg__')
-            yield "--{}={}".format(*list(argument.items())[0])
+            yield "--{0}={1}".format(*list(argument.items())[0])
         else:
             yield argument
 
@@ -253,7 +253,7 @@ def process_lowstate(lowstate):
             require_state, require_name = list(require.items())[0]
 
             if require_state == 'sls':
-                requires.append((state['order'], 'cluster_{}'.format(require_name.replace('.', '_').replace('-', '_'))))
+                requires.append((state['order'], 'cluster_{0}'.format(require_name.replace('.', '_').replace('-', '_'))))
                 continue
 
             required_state = id_map[(require_state, require_name)]