Improve software inventory command

Extend commands.html template to keep scope tree, and action buttons
state.

When in the software inventory view, there exists two options: 'update'
or 'view'. Do not print raw json response from ogserver about the software
inventory/profile.

When vieweing the software list, print a html table using the new
template: software_list.html.

Do not print blank pages with plain text html error codes when something
goes wrong. Instead, print an error message after redirecting to the
commands view.

1 files changed, 11 insertions, 6 deletions

diff --git a/ogcp/views.py b/ogcp/views.py
index c60bd08..49f5122 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -505,19 +505,24 @@ def action_software():
                                                'disk': int(disk),
                                                'partition': int(partition)})
             if r.status_code == requests.codes.ok:
-                return r.json()
-
+                software = r.json()['software']
+                scopes, clients = get_scopes(set(ips))
+                return render_template('actions/software_list.html',
+                                       software=software, form=form, scopes=scopes)
         elif form.update.data:
             r = g.server.post('/software', payload={'clients': ips,
                                                     'disk': disk,
                                                     'partition': partition})
             if r.status_code == requests.codes.ok:
                 flash(_('Software profile request sent successfully'), category='info')
-                return redirect(url_for('commands'))
-            flash(_('Error processing software profile request: ({})').format(r.status), category='error')
-        return make_response("400 Bad Request", 400)
+            else:
+                flash(_('Error processing software profile request: ({})').format(r.status), category='error')
+        else:
+            flash(_('Error processing software profile form'), category='error')
+        return redirect(url_for('commands'))
     else:
         ips = parse_elements(request.args.to_dict())
+        scopes, clients = get_scopes(set(ips))
         if not validate_elements(ips, max_len=1):
             return redirect(url_for('commands'))
 
@@ -531,7 +536,7 @@ def action_software():
                  f"| {PART_TYPE_CODES[part.get('code')]} "
                  f"{FS_CODES[part.get('filesystem')]}")
             )
-    return render_template('actions/software.html', form=form)
+    return render_template('actions/software.html', form=form, scopes=scopes)
 
 @app.route('/action/session', methods=['GET', 'POST'])
 @login_required