diff --git a/controllers/default.go b/controllers/default.go index 9b2a555..0000916 100644 --- a/controllers/default.go +++ b/controllers/default.go @@ -44,7 +44,7 @@ func (c *MainController) Prepare() { func (c *MainController) Get() { c.Data["sensors"] = getLastTemps() - c.TplNames = "index.tpl" + c.TplName = "index.tpl" } func getLastTemps() []SensorPrint { diff --git a/controllers/login.go b/controllers/login.go index 27b739b..26d426b 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -27,7 +27,7 @@ func (c *LoginController) Get() { return } - c.TplNames = "login.tpl" + c.TplName = "login.tpl" } func (c *LoginController) Post() { diff --git a/controllers/relay.go b/controllers/relay.go index fede7c5..324f747 100644 --- a/controllers/relay.go +++ b/controllers/relay.go @@ -45,7 +45,7 @@ func (c *ViewRelayController) Get() { } } - c.TplNames = "relay.tpl" + c.TplName = "relay.tpl" } func (c *ViewRelayController) Post() { diff --git a/controllers/sensors.go b/controllers/sensors.go index 026b010..19bd2c8 100644 --- a/controllers/sensors.go +++ b/controllers/sensors.go @@ -36,7 +36,7 @@ func (c *SensorsController) Get() { c.Data["sensors"] = sensors c.Data["relays"] = relays c.Data["compteurs"] = compteurs - c.TplNames = "sensors.tpl" + c.TplName = "sensors.tpl" } func (c *SensorsController) Post() { diff --git a/controllers/teleinfo.go b/controllers/teleinfo.go index c8abee5..e23a9ca 100644 --- a/controllers/teleinfo.go +++ b/controllers/teleinfo.go @@ -69,7 +69,7 @@ func (c *ViewTeleinfoController) Get() { c.Data["dataPower"] = template.JS(dataPower) } - c.TplNames = "teleinfo.tpl" + c.TplName = "teleinfo.tpl" } diff --git a/controllers/user.go b/controllers/user.go index 8d8040a..e0cf87a 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -24,7 +24,7 @@ func (c *UserController) Prepare() { } func (c *UserController) Get() { - c.TplNames = "user.tpl" + c.TplName = "user.tpl" } func (c *UserController) Post() { diff --git a/controllers/viewLog.go b/controllers/viewLog.go index 2076983..f33a901 100644 --- a/controllers/viewLog.go +++ b/controllers/viewLog.go @@ -32,7 +32,7 @@ func (c *WebSocketController) Prepare() { // Get method handles GET requests for WebSocketController. func (c *WebSocketController) Get() { c.Data["hostWS"] = "ws://"+c.Ctx.Request.Host+variables.WebSocketLogRoute - c.TplNames = "watchlog.tpl" + c.TplName = "watchlog.tpl" } diff --git a/controllers/viewTemp.go b/controllers/viewTemp.go index a7dab26..1b89842 100644 --- a/controllers/viewTemp.go +++ b/controllers/viewTemp.go @@ -41,7 +41,7 @@ func (c *ViewTempController) Get() { } c.Data["dataTemp"] = template.JS(dataTemp) - c.TplNames = "temp.tpl" + c.TplName = "temp.tpl" } /* diff --git a/main.go b/main.go index 84d2735..3328c50 100644 --- a/main.go +++ b/main.go @@ -29,12 +29,12 @@ func init() { db := "" if database.DatabaseInstance == database.MySQL { // MySQL - orm.RegisterDriver(database.MySQL, orm.DR_MySQL) + orm.RegisterDriver(database.MySQL, orm.DRMySQL) url = database.UserDB + ":" + database.PwdDB + "@/" + database.DataBase + "?charset=utf8" db = "mysql" } else { // SQLite - orm.RegisterDriver(database.SQLITE, orm.DR_Sqlite) + orm.RegisterDriver(database.SQLITE, orm.DRSqlite) url = "datahouse.db" db = "sqlite3" }