# HG changeset patch
# User bsw
# Date 1350746464 -7200
# Node ID 403e8c211592090216bb6108446de1e8e6016965
# Parent  ebcc40a3f8b30dee4c37f66be54e8219cc6de90d
Going to version 2.1.2

diff -r ebcc40a3f8b3 -r 403e8c211592 app/main/_filter/21_auth.lua
--- a/app/main/_filter/21_auth.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/app/main/_filter/21_auth.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -17,6 +17,7 @@
     or action == "confirm_notify_email"
     or view   == "menu"
     or action == "set_lang"
+    or view   == "404"
   )
 )
 
diff -r ebcc40a3f8b3 -r 403e8c211592 app/main/delegation/_action/update.lua
--- a/app/main/delegation/_action/update.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/app/main/delegation/_action/update.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -23,7 +23,6 @@
   return
 end
 
-
 local delegation = Delegation:by_pk(truster_id, unit_id, area_id, issue_id)
 
 
diff -r ebcc40a3f8b3 -r 403e8c211592 app/main/index/404.lua
--- a/app/main/index/404.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/app/main/index/404.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -1,1 +1,3 @@
-slot.put_into("title", "404 Not found")
+ui.title("404 Not found")
+
+ui.container{ content = "Page not found" }
diff -r ebcc40a3f8b3 -r 403e8c211592 config/init.lua
--- a/config/init.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/config/init.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -3,7 +3,7 @@
 -- (except when you really know what you are doing!)
 -- ========================================================================
 
-config.app_version = "2.1.1"
+config.app_version = "2.1.2"
 
 if not config.password_hash_algorithm then
   config.password_hash_algorithm = "crypt_sha512"
diff -r ebcc40a3f8b3 -r 403e8c211592 env/model/has_rendered_content.lua
--- a/env/model/has_rendered_content.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/env/model/has_rendered_content.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -11,7 +11,6 @@
     if type(class.primary_key) == "table" then
       for i, key in ipairs(class.primary_key) do
         selector:add_where{ "$ = ?", { key }, self[key] }
-        trace.debug(key, self[key], self.id)
       end
     else
       selector:add_where{ "id = ?", self.id }
diff -r ebcc40a3f8b3 -r 403e8c211592 model/member.lua
--- a/model/member.lua	Sat Oct 20 17:20:51 2012 +0200
+++ b/model/member.lua	Sat Oct 20 17:21:04 2012 +0200
@@ -269,6 +269,10 @@
   return selector
 end
 
+function Member:lockForReference()
+  self.get_db_conn().query("LOCK TABLE " .. self:get_qualified_table() .. " IN ROW SHARE MODE")
+end
+
 function Member.object:set_password(password)
   trace.disable()
   
@@ -593,3 +597,4 @@
   selector:optional_object_mode()
   return selector:exec()
 end
+