Merge pull request #1082 from schakrava/858_part2

858 part2

src/rockstor/storageadmin/models/__init__.py

@@ -44,7 +44,8 @@
 from pool_balance import PoolBalance
 from tls_certificate import TLSCertificate
 from rockon import (RockOn, DImage, DContainer, DPort, DVolume,
-                    ContainerOption, DCustomConfig, DContainerLink)
+                    ContainerOption, DCustomConfig, DContainerLink,
+                    DContainerEnv)
 from smart import (SMARTAttribute, SMARTCapability, SMARTErrorLog,
                    SMARTErrorLogSummary, SMARTTestLog, SMARTTestLogDetail,
                    SMARTIdentity, SMARTInfo)

src/rockstor/storageadmin/models/rockon.py

@@ -62,6 +62,10 @@ class DContainer(models.Model):
     dimage = models.ForeignKey(DImage)
     name = models.CharField(max_length=1024, unique=True)
     launch_order = models.IntegerField(default=1)
+    #if uid is None, container's owner is not set. defaults to root.
+    #if it's -1, then owner is set to the owner of first volume, if any.
+    #if it's an integer other than -1, like 0, then owner is set to that uid.
+    uid = models.IntegerField(null=True)
 
     class Meta:
         app_label = 'storageadmin'
@@ -131,3 +135,15 @@ class DCustomConfig(models.Model):
     class Meta:
         unique_together = ('rockon', 'key',)
         app_label = 'storageadmin'
+
+
+class DContainerEnv(models.Model):
+    container = models.ForeignKey(DContainer)
+    key = models.CharField(max_length=1024)
+    val = models.CharField(max_length=1024, null=True)
+    description = models.CharField(max_length=2048, null=True)
+    label = models.CharField(max_length=64, null=True)
+
+    class Meta:
+        unique_together = ('container', 'key')
+        app_label = 'storageadmin'

src/rockstor/storageadmin/serializers.py

@@ -24,11 +24,12 @@
                                  NFSExportGroup, SFTP, AdvancedNFSExport,
                                  OauthApp, NetatalkShare, Group, PoolBalance,
                                  SambaCustomConfig, TLSCertificate, RockOn,
-                                 DVolume, DPort, DCustomConfig, SMARTAttribute,
-                                 SMARTCapability, SMARTInfo, SMARTErrorLog,
-                                 SMARTErrorLogSummary, SMARTTestLog,
-                                 SMARTTestLogDetail, SMARTIdentity,
-                                 ConfigBackup, EmailClient, UpdateSubscription)
+                                 DVolume, DPort, DCustomConfig, DContainerEnv,
+                                 SMARTAttribute, SMARTCapability, SMARTInfo,
+                                 SMARTErrorLog, SMARTErrorLogSummary,
+                                 SMARTTestLog, SMARTTestLogDetail,
+                                 SMARTIdentity, ConfigBackup, EmailClient,
+                                 UpdateSubscription)
 from django.contrib.auth.models import User as DjangoUser
 
 
@@ -209,6 +210,9 @@ class RockOnCustomConfigSerializer(serializers.ModelSerializer):
     class Meta:
         model = DCustomConfig
 
+class RockOnEnvironmentSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = DContainerEnv
 
 class SMARTCapabilitySerializer(serializers.ModelSerializer):
     class Meta:

src/rockstor/storageadmin/static/storageadmin/js/models/models.js

@@ -642,6 +642,27 @@ var RockOnCustomConfigCollection = RockStorPaginatedCollection.extend({
     }
 });
 
+var RockOnEnvironment = Backbone.Model.extend({
+    urlRoot: '/api/rockon/environment/' + this.rid
+});
+
+var RockOnEnvironmentCollection = RockStorPaginatedCollection.extend({
+    model: RockOnEnvironment,
+    initialize: function(models, options) {
+	this.constructor.__super__.initialize.apply(this, arguments);
+	if (options) {
+	    this.rid = options.rid;
+	}
+    },
+    baseUrl: function() {
+	if (this.rid) {
+	    return '/api/rockons/environment/' + this.rid;
+	} else {
+	    return '/api/rockons/environment';
+	}
+    }
+});
+
 var EmailAccount = Backbone.Model.extend({
     urlRoot: '/api/email'
 });

src/rockstor/storageadmin/static/storageadmin/js/rockstor.js

@@ -493,7 +493,7 @@ RockstorWizardPage = Backbone.View.extend({
 
     render: function() {
 	$(this.el).html(this.template({
-	    model: this.model,
+	    model: this.model
 	}));
 	return this;
     },

src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/more_info.jst

@@ -1 +1 @@
-{{rockonMoreInfo}}
+{{{rockonMoreInfo}}}