liquid_feedback_frontend
changeset 929:403e8c211592 v2.1.2
Going to version 2.1.2
author | bsw |
---|---|
date | Sat Oct 20 17:21:04 2012 +0200 (2012-10-20) |
parents | ebcc40a3f8b3 |
children | 2cb7c9a7706b |
files | app/main/_filter/21_auth.lua app/main/delegation/_action/update.lua app/main/index/404.lua config/init.lua env/model/has_rendered_content.lua model/member.lua |
line diff
1.1 --- a/app/main/_filter/21_auth.lua Sat Oct 20 17:20:51 2012 +0200 1.2 +++ b/app/main/_filter/21_auth.lua Sat Oct 20 17:21:04 2012 +0200 1.3 @@ -17,6 +17,7 @@ 1.4 or action == "confirm_notify_email" 1.5 or view == "menu" 1.6 or action == "set_lang" 1.7 + or view == "404" 1.8 ) 1.9 ) 1.10
2.1 --- a/app/main/delegation/_action/update.lua Sat Oct 20 17:20:51 2012 +0200 2.2 +++ b/app/main/delegation/_action/update.lua Sat Oct 20 17:21:04 2012 +0200 2.3 @@ -23,7 +23,6 @@ 2.4 return 2.5 end 2.6 2.7 - 2.8 local delegation = Delegation:by_pk(truster_id, unit_id, area_id, issue_id) 2.9 2.10
3.1 --- a/app/main/index/404.lua Sat Oct 20 17:20:51 2012 +0200 3.2 +++ b/app/main/index/404.lua Sat Oct 20 17:21:04 2012 +0200 3.3 @@ -1,1 +1,3 @@ 3.4 -slot.put_into("title", "404 Not found") 3.5 +ui.title("404 Not found") 3.6 + 3.7 +ui.container{ content = "Page not found" }
4.1 --- a/config/init.lua Sat Oct 20 17:20:51 2012 +0200 4.2 +++ b/config/init.lua Sat Oct 20 17:21:04 2012 +0200 4.3 @@ -3,7 +3,7 @@ 4.4 -- (except when you really know what you are doing!) 4.5 -- ======================================================================== 4.6 4.7 -config.app_version = "2.1.1" 4.8 +config.app_version = "2.1.2" 4.9 4.10 if not config.password_hash_algorithm then 4.11 config.password_hash_algorithm = "crypt_sha512"
5.1 --- a/env/model/has_rendered_content.lua Sat Oct 20 17:20:51 2012 +0200 5.2 +++ b/env/model/has_rendered_content.lua Sat Oct 20 17:21:04 2012 +0200 5.3 @@ -11,7 +11,6 @@ 5.4 if type(class.primary_key) == "table" then 5.5 for i, key in ipairs(class.primary_key) do 5.6 selector:add_where{ "$ = ?", { key }, self[key] } 5.7 - trace.debug(key, self[key], self.id) 5.8 end 5.9 else 5.10 selector:add_where{ "id = ?", self.id }
6.1 --- a/model/member.lua Sat Oct 20 17:20:51 2012 +0200 6.2 +++ b/model/member.lua Sat Oct 20 17:21:04 2012 +0200 6.3 @@ -269,6 +269,10 @@ 6.4 return selector 6.5 end 6.6 6.7 +function Member:lockForReference() 6.8 + self.get_db_conn().query("LOCK TABLE " .. self:get_qualified_table() .. " IN ROW SHARE MODE") 6.9 +end 6.10 + 6.11 function Member.object:set_password(password) 6.12 trace.disable() 6.13 6.14 @@ -593,3 +597,4 @@ 6.15 selector:optional_object_mode() 6.16 return selector:exec() 6.17 end 6.18 +