Commit 8e16c1bd authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Minor global fixes.

parent a73c29d1

services/webapp/code/rosetta/core_app/management/commands/core_app_populate.py

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ class Command(BaseCommand): 
            testuser = User.objects.create_user('testuser', 'testuser@rosetta.platform', 'testpass')

            print('Making testuser admin')

            testuser.is_staff = True

            testuser.is_admin=True

            testuser.is_superuser=True

            testuser.save()

            print('Creating testuser profile')

services/webapp/code/rosetta/core_app/templates/components/computing_component.html

+2 −5
Original line number Diff line number Diff line 


{% if details %}

{% if data.created %}

<div class="alert alert-success" style="width:500px;">Computing resource created successfully.</div>

{% endif %}



<div style="float:left; width:500px; margin:10px; margin-bottom:20px">

  <table class="dashboard" style="width:100%">

    <tr>
@@ -68,10 +63,12 @@ 
        {% endif %}

      </td>

    </tr>

    {% if computing.user == data.user or data.user.is_staff %}

    <tr>

      <td><b>Conf</b></td>

      <td><pre style="font-size:0.9em">{{ computing.conf_json }}</pre></td>

    </tr>

    {% endif %}

    {% if computing.user == data.user or data.user.is_staff %}

    <tr>

      <td><b>Actions</b></td>

services/webapp/code/rosetta/core_app/templates/components/storage_component.html

+5 −6
Original line number Diff line number Diff line 


{% if details %}

{% if data.created %}

<div class="alert alert-success" style="width:500px;">Storage created successfully.</div>

{% endif %}

<div style="float:left; width:500px; margin:10px; margin-bottom:20px">

  <table class="dashboard" style="width:100%">

    <tr>
@@ -48,8 +44,11 @@ 
      <td><b>Browsable</b></td>

      <td>{% if storage.browsable %}Yes{% else %}No{% endif %}</td>

    </tr>

    {% if storage.user == data.user or data.user.is_staff %}

    <tr>

      <td><b>Conf</b></td><td><pre style="font-size:0.9em">{{ storage.conf_json }}</pre></td></tr>

      <td><b>Conf</b></td><td><pre style="font-size:0.9em">{{ storage.conf_json }}</pre></td>

    </tr>

    {% endif %}

    {% if storage.user == data.user or data.user.is_staff %}

    <tr>

      <td><b>Actions</b></td>

services/webapp/code/rosetta/core_app/views.py

+2 −3
Original line number Diff line number Diff line
@@ -1168,7 +1168,6 @@ def edit_software(request): 
#  Computing resources

#=========================





@private_view

def computing(request):
@@ -1219,7 +1218,7 @@ def computing(request): 
            group=computing.group

        )

        new_computing.save()

        return redirect('/edit_computing/?uuid={}&created=True'.format(new_computing.uuid))

        return redirect('/edit_computing/?uuid={}&saved=True'.format(new_computing.uuid))



    return render(request, 'computing.html', {'data': data})
@@ -1293,7 +1292,6 @@ def add_computing(request): 
    return render(request, 'add_computing.html', {'data': data})







@private_view

def edit_computing(request):
@@ -1374,6 +1372,7 @@ def edit_computing(request): 
#=========================

#  Storage

#=========================



@private_view

def storage(request):