Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud

Makefile

@@ -3,7 +3,8 @@ SHELL := /bin/bash
 
 default: migrate collectstatic mo restart
 
-pull: default
+pulldef: pull default
+pull:
 	git pull
 
 po:

cloud/urls.py

@@ -37,7 +37,7 @@ urlpatterns = patterns('',
      url(r'^store/gui/$', 'store.views.gui', name='store_gui'),
      url(r'^store/top/$', 'store.views.toplist', name='store_top'),
      url(r'^ajax/templateWizard$', 'one.views.ajax_template_wizard', name='ajax_template_wizard'),
-     url(r'^ajax/share/(?P<id>\d+)$', 'one.views.ajax_share_wizard', name='ajax_share_wizard'),
+     url(r'^ajax/share/(?P<id>\d+)/$', 'one.views.ajax_share_wizard', name='ajax_share_wizard'),
      url(r'^ajax/share/(?P<id>\d+)/(?P<gid>\d+)$', 'one.views.ajax_share_wizard', name='ajax_share_wizard'),
      url(r'^ajax/template/delete/$', 'one.views.ajax_template_delete', name='ajax_template_delete'),
      url(r'^ajax/template_name_unique/(?P<name>.*)$', 'one.views.ajax_template_name_unique', name='ajax_template_name_unique'),

one/models.py

@@ -79,6 +79,14 @@ class UserCloudDetails(models.Model):
         return c
     def get_instance_pc(self):
         return 100*self.get_weighted_instance_count()/self.instance_quota
+    def get_weighted_share_count(self):
+        c = 0
+        for i in Share.objects.filter(owner=self.user).all():
+            c = c + i.template.instance_type.credit * i.instance_limit
+        return c
+    def get_share_pc(self):
+        return 100*self.get_weighted_share_count()/self.share_quota
+
 
 def set_quota(sender, instance, created, **kwargs):
     if not StoreApi.userexist(instance.user.username):
@@ -158,7 +166,7 @@ TYPES = {"LAB": {"verbose_name": _('lab'),         "id": "LAB",     "suspend": t
 TYPES_L = sorted(TYPES.values(), key=lambda m: m["suspend"])
 TYPES_C = tuple([(i[0], i[1]["verbose_name"]) for i in TYPES.items()])
 class Share(models.Model):
-    name = models.CharField(max_length=100, unique=True, verbose_name=_('name'))
+    name = models.CharField(max_length=100, verbose_name=_('name'))
     description = models.TextField(verbose_name=_('description'))
     template = models.ForeignKey('Template', null=False, blank=False)
     group = models.ForeignKey(Group, null=False, blank=False)
@@ -168,6 +176,7 @@ class Share(models.Model):
             help_text=_('Maximal count of instances launchable for this share.'))
     per_user_limit = models.IntegerField(verbose_name=_('per user limit'),
             help_text=_('Maximal count of instances launchable by a single user.'))
+    owner = models.ForeignKey(User, null=True, blank=True)
 
 
     def get_running_or_stopped(self):

one/static/box.less

@@ -161,6 +161,13 @@
 
             }
         }
+        .shares {
+            margin-left: 40px;
+            li {
+                height: 30px;
+                position: relative;
+            }
+        }
         @placeholderColor: #555;
         input::-webkit-input-placeholder{
             color: @placeholderColor;

one/static/cloud.js

@@ -95,7 +95,7 @@ $(function() {
     })
     $('.template-share').click(function(e) {
         e.preventDefault(); e.stopPropagation();
-        $.get('/ajax/share/'+$(this).data('id'), function(data) {
+        $.get('/ajax/share/'+$(this).data('id')+'/'+$(this).data('gid'), function(data) {
             $('#modal-container').html(data);
         })
         $('#modal').show();

one/templates/box-templatelist.html

 {% load i18n %}
+{% load l10n %}
 {% get_current_language as LANGUAGE_CODE %}
     <div class="contentblock" id="template">
         <h2>{% trans "Templates" %}</h2>
@@ -6,23 +7,41 @@
             {% for t in mytemplates %}
             <li class="wm" id="t{{t.id }}">
                 <div class="summary {% if t.state == 'NEW' or t.state == 'SAVING'%}unfinished{% endif %}">
-                    <div class="name">{{t.name}}
-                        {% if t.myshares %}
-                        <ul>
-                        {% for i in t.myshares %}
-                        <li>share {{i.name}} -&gt; {{i.group}}</li>
-                        {% endfor %}
-                        {% endif %}
+                    <div class="name">
+                        {{t.name}}
                     </div>
+
                     <div class="status">{{t.state}}</div>
                     <div class="actions">
+                        {% if t.state == 'READY' %}
                         <a href="#" class="try-template-button" data-id="{{t.id}}" title="{% trans "Try"  %}">
-                            <img src="static/icons/control.png" alt="{% trans "Start" %}"/></a>
+                            <img src="/static/icons/control.png" alt="{% trans "Start" %}"/></a>
                         <a href="#" title="{% trans "Edit" %}"><img src="/static/icons/pencil.png" alt="{% trans "Edit" %}" /></a>
+                        <a href="#" class="template-share" data-id="{{t.id}}" data-gid="{{group.id}}" title="{% trans "Share" %}"><img src="/static/icons/user-share.png" alt="{% trans "Share" %}" /></a>
+                        {% endif %}
                         <a href="#" class="delete-template-button" data-id="{{ t.id }}" data-name="{{ t.name }}" title="{% trans "Remove" %}"><img src="/static/icons/minus-circle.png" alt="{% trans "Remove" %}" /></a>
-                        <a href="#" class="template-share" data-id="{{t.id}}" title="{% trans "Share" %}"><img src="/static/icons/user-share.png" alt="{% trans "Share" %}" /></a>
                     </div>
                     <div class="clear"></div>
+                    {% if t.myshares %}
+                    <ul class="shares">
+                        {% for i in t.myshares %}
+                        <li>
+
+                                <div class="quota">
+                                    <div class="used" style="width: {{ i.get_instance_pc }}%"></div>
+                                </div>
+                            <form action="/vm/unshare/{{i.id}}/" method="post">
+                                <span title="{{i.name}}">{{i.name|truncatechars:20}}</span>
+                                ({{i.get_running}}/{{i.instance_limit}} = {{i.get_instance_pc}}%)
+
+                                {% csrf_token %}
+                                <input type="submit" value="unshare" style="float: right"/>
+                            </form>
+                            <div class="clear"></div>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                    {% endif %}
                 </div>
                 <div class="details">
                     <ul>
@@ -65,23 +84,34 @@
             {% for t in publictemplates %}
             <li class="wm" id="t{{t.id }}">
                 <div class="summary public-template">
-                    <div class="name">{{t.name}}
-                        {% if t.myshares %}
-                        <ul>
-                        {% for i in t.myshares %}
-                        <li>share {{i.name}} -&gt; {{i.group}}
-                        <a href="/vm/unshare/{{i.id}}/">unshare</a>
-                        </li>
-                        {% endfor %}
-                        {% endif %}
+                    <div class="name">
+                        {{t.name}}
                     </div>
                     <div class="status">{{t.state}}</div>
                     <div class="actions">
+                        {% if t.state == 'READY' %}
                         <a href="#" class="try-template-button" data-id="{{t.id}}" title="{% trans "Try"  %}">
                             <img src="/static/icons/control.png" alt="{% trans "Start" %}"/></a>
-                        <a href="#" class="template-share" data-id="{{t.id}}" {%if group%}data-gid="{{group.id}}"{%endif%} title="{% trans "Share" %}"><img src="/static/icons/user-share.png" alt="{% trans "Share" %}" /></a>
+                        <a href="#" class="template-share" data-id="{{t.id}}" data-gid="{{group.id}}" title="{% trans "Share" %}"><img src="/static/icons/user-share.png" alt="{% trans "Share" %}" /></a>
+                        {% endif %}
                     </div>
                     <div class="clear"></div>
+                    {% if t.myshares %}
+                    <ul class="shares">
+                        {% for i in t.myshares %}
+                        <li>
+                            <form action="/vm/unshare/{{i.id}}/" method="post">
+                                <span title="{{i.name}}">{{i.name|truncatechars:20}}</span>
+                                ({{i.get_running}}/{{i.instance_limit}} = {{i.get_instance_pc}}%)
+
+                                {% csrf_token %}
+                                <input type="submit" value="unshare" style="float: right"/>
+                            </form>
+                            <div class="clear"></div>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                    {% endif %}
                 </div>
                 <div class="details">
                     <ul>
@@ -102,9 +132,9 @@
             <li class="wm small">
                 <div class="summary">
                     <div class="quota">
-                        <div class="used" style="background-color: rgba(0,255,0,0.2); width: 19%"></div>
+                        <div class="used" style="background-color: rgba(0,255,0,0.2); width: {{userdetails.get_share_pc|unlocalize}}%"></div>
                     </div>
-                    <div class="name">{% blocktrans with used=19 all=100 %}Share quota: {{used}}/{{all}}{% endblocktrans %}</div>
+                    <div class="name">{% blocktrans with used=userdetails.get_weighted_share_count all=userdetails.share_quota %}Share quota: {{used}}/{{all}}{% endblocktrans %}</div>
                     <div class="clear"></div>
                 </div>
             </li>

one/templates/home.html

@@ -65,7 +65,7 @@
             <li class="wm small">
                 <div class="summary">
                     <div class="quota">
-                        <div class="used" style="background-color: rgba(0,255,0,0.2); width: {{userdetails.get_instance_pc}}%"></div>
+                        <div class="used" style="background-color: rgba(0,255,0,0.2); width: {{userdetails.get_instance_pc|unlocalize}}%"></div>
                     </div>
                     <div class="name">{% blocktrans with used=userdetails.get_weighted_instance_count all=userdetails.instance_quota %}Personal quota: {{used}}/{{all}}{% endblocktrans %}</div>
                     <div class="clear"></div>
@@ -84,7 +84,8 @@
     {% endif %}
     {% endfor %}
 {% include "box-templatelist.html" %}
+
+{% include "box-grouplist.html" %}
 </div>
 {% include "box-filelist.html" %}
-{% include "box-grouplist.html" %}
 {% endblock %}

one/templates/new-share.html

 {% load i18n %}
 {% get_current_language as LANGUAGE_CODE %}
-<form action="/ajax/share/{{base.id}}" method="post" id="template-wizard">{% csrf_token %}
+<form action="/ajax/share/{{base.id}}/" method="post" id="template-wizard">{% csrf_token %}
     <div id="new-share" class="wizard">
         <h2>{% blocktrans with t=base.name%}Sharing template: {{t}}{% endblocktrans %}</h2>
+        {% if not group %}
+        <div class="hilight">
         <p>{% trans "Choose a group" %}</p>
                 {% if not groups %}
                     <p class="hilight">{% trans "You have no groups." %}</p>
@@ -10,14 +12,18 @@
         <ul>
             <li>
                 <label for="share-group">{% trans "Group" %}</label>
-                <select name="group"{% if not groups %} disabled=""{%endif%}>
+                <select id="share-group-select" name="group"{% if not groups %} disabled=""{%endif%}>
                     <option value="" selected="" class="dummy">--</option>
                     {%for i in groups%}<option value="{{i.id}}">{{i.name}} ({{i.members.count}})</option>{%endfor%}
                 </select>
                 <div class="clear"></div>
             </li>
         </ul>
+        </div>
         <div class="clear"></div>
+        {% else %}
+        <input type="hidden" name="group" value="{{group.id}}" />
+        {% endif %}
         <p>{% trans "Change the parameters as needed." %}</p>
         <ul>
             <li>
@@ -71,22 +77,23 @@
         </ul>
         <nav>
             <input type="reset" class="prev" value="{% trans "Cancel" %}" />
-            <input type="submit" value="{% trans "Share" %}" {% if not groups %} disabled=""{%endif%}/>
+            <input type="submit" value="{% trans "Share" %}" {% if not groups %}{%endif%}/>
             <div class="clear"></div>
         </nav>
         <script type="text/javascript">
             $(function(){
-                if ("" == $(":selected this").val())
+                {% if not group %}
+                if (!$("select#share-group-select :selected").val())
                     $('#new-share input[type=submit]').attr("disabled", "")
                 else
                     $('#new-share input[type=submit]').removeAttr("disabled")
-                $('#new-share select').change(function(e) {
-                    if ("" == $(":selected this").val())
+                $('#new-share select#share-group-select').change(function(e) {
+                    if (!$(":selected", this).val())
                         $('#new-share input[type=submit]').attr("disabled", "")
                     else
                         $('#new-share input[type=submit]').removeAttr("disabled")
                 })
-
+                {% endif %}
                 $('#new-share nav .prev').click(function(){
                     $('#modal').hide();
                 })

one/views.py

@@ -141,6 +141,9 @@ ajax_template_wizard = login_required(AjaxTemplateWizard.as_view())
 
 class AjaxShareWizard(View):
     def get(self, request, id, gid=None, *args, **kwargs):
+        det = UserCloudDetails.objects.get(user=request.user)
+        if det.get_weighted_share_count() >= det.share_quota:
+            return HttpResponse(unicode(_('You do not have any free share quota.')))
         types = TYPES_L
         types[0]['default'] = True
         for i, t in enumerate(types):
@@ -150,13 +153,14 @@ class AjaxShareWizard(View):
         if gid:
             gid = get_object_or_404(Group, id=gid)
 
-        return render_to_response('new-share.html', RequestContext(request,{
+        return render_to_response('new-share.html', RequestContext(request, {
             'base': get_object_or_404(Template, id=id),
             'groups': request.user.person_set.all()[0].owned_groups.all(),
             'types': types,
             'group': gid,
             }))
     def post(self, request, id, gid=None, *args, **kwargs):
+        det = UserCloudDetails.objects.get(user=request.user)
         base = get_object_or_404(Template, id=id)
         if base.owner != request.user and not base.public and not request.user.is_superuser:
             raise PermissionDenied()
@@ -172,12 +176,14 @@ class AjaxShareWizard(View):
         if not stype in TYPES.keys():
             raise PermissionDenied()
         il = request.POST['instance_limit']
-        # TODO check quota
+        if det.get_weighted_share_count() + int(il)*base.instance_type.credit > det.share_quota:
+            messages.error(request, _('You do not have enough free share quota.'))
+            return redirect('/')
         s = Share.objects.create(name=request.POST['name'], description=request.POST['description'],
                 type=stype, instance_limit=il, per_user_limit=request.POST['per_user_limit'],
-                group=group, template=base)
+                group=group, template=base, owner=request.user)
         messages.success(request, _('Successfully shared %s.') % base)
-        return redirect('/')
+        return redirect(group)
 ajax_share_wizard = login_required(AjaxShareWizard.as_view())
 
 

school/templates/show-group.html

@@ -3,9 +3,9 @@
 {% get_current_language as LANGUAGE_CODE %}
 {% block content %}
 <div class="boxes">
-    <div class="contentblock">
+    <!-- <div class="contentblock">
         <h2>Summary</h2>
-    </div>
+    </div> -->
     <div class="contentblock" id="group-members">
         <h2>{% trans "Members" %}</h2>
         <ul class="wm-list">
@@ -31,7 +31,7 @@
                         {% if not member.user %}
                         {% trans "This user never logged in, no data available" %}
                         {% else %}
-                        {{member}} ({{member.code}})
+                        {{member}} ({{member.code}}) <a href="mailto:{{member.user.email}}">E-mail</a>
                         {% endif %}
                     </div>
                 </div>
@@ -51,7 +51,7 @@
     </div>
 </div>
 <div class="boxes">
-
+    {% if noshare %}
         <div id="new-wm-tooltip" style="position:absolute">
             <div id="new-wm-tooltip-container">
                 <p>
@@ -63,6 +63,7 @@
                 <div id="new-wm-tooltip-tail"></div>
             </div>
         </div>
+    {% endif %}
         {% include "box-templatelist.html" %}
 </div>
 {% endblock %}

school/views.py

@@ -112,7 +112,7 @@ def login(request):
             g.members.add(p)
             g.save()
             logger.warning("Django affiliation group %s added to %s" % (a, p))
-        except e as Exception:
+        except Exception as e:
             logger.warning("Django FAIL affiliation group %s added to %s %s" % (a, p, e))
     user.save()
 
@@ -154,18 +154,25 @@ def group_show(request, gid):
     user = request.user
     group = get_object_or_404(Group, id=gid)
     mytemplates = [t for t in Template.objects.filter(owner=request.user).all()]
+    noshare = True
     for i, t in enumerate(mytemplates):
         t.myshares = t.share_set.filter(group=group)
+        if t.myshares.exists():
+            noshare = False
         mytemplates[i] = t
     publictemplates = [t for t in Template.objects.filter(public=True, state='READY').all()]
     for i, t in enumerate(publictemplates):
         t.myshares = t.share_set.filter(group=group)
+        if t.myshares.exists():
+            noshare = False
         publictemplates[i] = t
     return render_to_response("show-group.html", RequestContext(request,{
         'group': group,
         'members': group.members.all(),
         'mytemplates': mytemplates,
         'publictemplates': publictemplates,
+        'noshare': noshare,
+        'userdetails': UserCloudDetails.objects.get(user=request.user),
         }))
 
 @login_required