From 6d153a6acfe9f04af2f4e14dbfabb3efa4b742aa Mon Sep 17 00:00:00 2001
From: "Ing. Jan KRCMAR" <honza801@civ.zcu.cz>
Date: Thu, 26 Oct 2017 15:51:10 +0200
Subject: [PATCH] users with can_clone_instances ability are allowed to
 change_options of vm

---
 instances/templates/instance.html | 10 +++++++++-
 instances/views.py                | 28 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 39e9b7e..1579da2 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -620,11 +620,15 @@
                                                         {% trans "XML" %}
                                                     </a>
                                                 </li>
+                                            {% endif %}
+                                            {% if request.user.is_superuser or request.user.userattributes.can_clone_instances %}
                                                 <li role="presentation">
                                                     <a href="#options" aria-controls="options" role="tab" data-toggle="tab">
                                                         {% trans "Options" %}
                                                     </a>
                                                 </li>
+                                            {% endif %}
+                                            {% if request.user.is_superuser %}
                                                 <li role="presentation">
                                                     <a href="#users" aria-controls="users" role="tab" data-toggle="tab">
                                                         {% trans "Users" %}
@@ -966,6 +970,8 @@
                                                     </form>
                                                     <div class="clearfix"></div>
                                                 </div>
+                                            {% endif %}
+                                            {% if request.user.is_superuser or request.user.userattributes.can_clone_instances %}
                                                 <div role="tabpanel" class="tab-pane tab-pane-bordered" id="options">
                                                     <form class="form-horizontal" action="" method="post" role="form">{% csrf_token %}
                                                         <div class="form-group">
@@ -983,7 +989,7 @@
                                                         <div class="form-group">
                                                             <label class="col-sm-3 control-label">{% trans "Is template" %}</label>
                                                             <div class="col-sm-6">
-                                                                <input type="checkbox" name="is_template" value="true" id="is_template" {% if instance.is_template %}checked{% endif %}>
+                                                                <input type="checkbox" name="is_template" value="true" id="is_template" {% if instance.is_template %}checked{% endif %} {% if not request.user.is_superuser %}disabled{% endif %}>
                                                             </div>
                                                         </div>
                                                         {% ifequal status 5 %}
@@ -994,6 +1000,8 @@
                                                     </form>
                                                     <div class="clearfix"></div>
                                                 </div>
+                                            {% endif %}
+                                            {% if request.user.is_superuser %}
                                                 <div role="tabpanel" class="tab-pane tab-pane-bordered" id="users">
                                                     <div>
                                                     <p style="font-weight:bold;">
diff --git a/instances/views.py b/instances/views.py
index 45b661a..b31e5ea 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -651,20 +651,6 @@ def instance(request, compute_id, vname):
                     addlogmsg(request.user.username, instance.name, msg)
                     return HttpResponseRedirect(request.get_full_path() + '#network')
 
-                if 'change_options' in request.POST:
-                    instance.is_template = request.POST.get('is_template', False)
-                    instance.save()
-                    
-                    options = {}
-                    for post in request.POST:
-                        if post in ['title', 'description']:
-                            options[post] = request.POST.get(post, '')
-                    conn.set_options(options)
-                    
-                    msg = _("Edit options")
-                    addlogmsg(request.user.username, instance.name, msg)
-                    return HttpResponseRedirect(request.get_full_path() + '#options')
-
                 if 'add_owner' in request.POST:
                     user_id = int(request.POST.get('user_id', ''))
                     
@@ -727,6 +713,20 @@ def instance(request, compute_id, vname):
                         addlogmsg(request.user.username, new_instance.name, msg)
                         return HttpResponseRedirect(reverse('instance', args=[compute_id, clone_data['name']]))
 
+                if 'change_options' in request.POST:
+                    instance.is_template = request.POST.get('is_template', False)
+                    instance.save()
+                    
+                    options = {}
+                    for post in request.POST:
+                        if post in ['title', 'description']:
+                            options[post] = request.POST.get(post, '')
+                    conn.set_options(options)
+                    
+                    msg = _("Edit options")
+                    addlogmsg(request.user.username, instance.name, msg)
+                    return HttpResponseRedirect(request.get_full_path() + '#options')
+
         conn.close()
 
     except libvirtError as lib_err: