summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2007-12-20 14:13:27 +0000
committerMika Havela <mika.havela@gmail.com>2007-12-20 14:13:27 +0000
commit4ee8f45c17f32cdc88259818a6b180c4da08d122 (patch)
tree796313efc8d3d8dcc2862a14343ab0ecce4817b2
parent7e6c744d4b85b6dee6ebd45948eb9c20739b55d2 (diff)
downloadacf-core-4ee8f45c17f32cdc88259818a6b180c4da08d122.tar.bz2
acf-core-4ee8f45c17f32cdc88259818a6b180c4da08d122.tar.xz
Added functionallity to display the alpine version in the template
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@433 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--app/acf_www-controller.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua
index 1d5966e..1043ade 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -144,6 +144,7 @@ view_resolver = function(self)
-- to APP or self
-- ***************************************************
local m,worker_loaded,model_loaded = self:new("alpine-baselayout/hostname")
+ local alpineversion = self:new("alpine-baselayout/alpineversion")
-- FIXME - this is ugly, but it puts the hostname the expected
-- format if the controller doesn't load correctly
@@ -163,6 +164,7 @@ view_resolver = function(self)
-- the inheritance means self.conf is used instead
action = self.conf.action,
hostname = h.hostname.value,
+ alpineversion = alpineversion.worker.read(alpineversion),
prefix = self.conf.prefix,
script = self.conf.appuri,
skin = self.conf.skin or ""