fireinfo: Fix reading memory from database

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/backend/fireinfo.py b/src/backend/fireinfo.py
index ff672043e1db103558e3bd8b30f3533d98cd1d13..831b8b4edce28cf00a5f3ceaa15e6bccf9e83aa2 100644 (file)
--- a/src/backend/fireinfo.py
+++ b/src/backend/fireinfo.py
@@ -615,6 +615,16 @@ class System(Object):
        def release(self):
                return self.blob.get("release")
 
+       # Memory
+
+       @property
+       def memory(self):
+               return self.blob.get("memory") * 1024
+
+       @property
+       def friendly_memory(self):
+               return util.format_size(self.memory or 0)
+
        @property
        def storage(self):
                return self.blob.get("storage_size", 0)
@@ -688,16 +698,6 @@ class Profile(Object):
        def processor(self):
                return Processor(self.backend, self.blob.get("cpu", {}))
 
-       # Memory
-
-       @property
-       def memory(self):
-               return self.blob.get("memory")
-
-       @property
-       def friendly_memory(self):
-               return util.format_size(self.memory or 0)
-
        # Virtual
 
        def is_virtual(self):

diff --git a/src/backend/iuse.py b/src/backend/iuse.py
index 19651b565ac32fb5227fc2f60f2e84d7ff8bd979..be28b790da090fb9af6b041619f9b6b996fac2a4 100644 (file)
--- a/src/backend/iuse.py
+++ b/src/backend/iuse.py
@@ -97,7 +97,7 @@ class Image1(ImageObject):
                        if self.profile.processor:
                                line2.append(self.profile.processor.friendly_string)
 
-                       line2.append(self.profile.friendly_memory)
+                       line2.append(self.profile.system.friendly_memory)
 
                self.draw_text((225, 5), " | ".join(line1))
                self.draw_text((225, 23), "%s" % " - ".join(line2))

diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index 44fd9b8d3ec412b3b6933ea826db76b8ebf1eaac..87f9bea33f7979dc93a7598d5f5429cb616eb4c0 100644 (file)
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -129,11 +129,11 @@
                        </div>
 
                        <div class="block">
-                               {% if profile.memory %}
+                               {% if profile.system.memory %}
                                        <div class="columns">
                                                <div class="column is-3">{{ _("Memory") }}</div>
                                                <div class="column is-9">
-                                                       {{ format_size(profile.memory) }}
+                                                       {{ format_size(profile.system.memory) }}
                                                </div>
                                        </div>
                                {% end %}