Commit 6889de0f authored Nov 24, 2021 by Stefano Alberto Russo

Enabled the "save as" button in the admin for the Container objects to allow...

Enabled the "save as" button in the admin for the Container objects to allow easily duplicate them. Fixed a bug in the populate. Minor fix.

parent 733e1765

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2,10 +2,14 @@ from django.contrib import admin

	from .models import Profile, LoginToken, Task, Container, Computing, Storage, KeyPair, Page		from .models import Profile, LoginToken, Task, Container, Computing, Storage, KeyPair, Page

			# Define a extra "ModelAdmin" for the Container model to allow "save as" to easily duplicate containers
			class ContainerForAdmin(admin.ModelAdmin):
			save_as = True

	admin.site.register(Profile)		admin.site.register(Profile)
	admin.site.register(LoginToken)		admin.site.register(LoginToken)
	admin.site.register(Task)		admin.site.register(Task)
	admin.site.register(Container)		admin.site.register(Container, ContainerForAdmin)
	admin.site.register(Computing)		admin.site.register(Computing)
	admin.site.register(Storage)		admin.site.register(Storage)
	admin.site.register(KeyPair)		admin.site.register(KeyPair)

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -157,8 +157,9 @@ class Container(models.Model):

	@property		@property
	def family_id(self):		def family_id(self):
	return base64.b64encode('{}\t{}\t{}'.format(self.name, self.registry, self.image_name).encode('utf8')).decode('utf8')		id_as_str = '{}\t{}\t{}'.format(self.name, self.registry, self.image_name)
			id_as_base64_str = base64.b64encode(id_as_str.encode('utf8')).decode('utf8')
			return id_as_base64_str

	@property		@property
	def color(self):		def color(self):

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

+1 −1

File changed.

Contains only whitespace changes.