# HG changeset patch
# User bsw
# Date 1334182254 -7200
# Node ID dbfde3c567903eb06d3b9d94deea3e42848c0338
# Parent  d0e12e1b8761ced3709310886bec1e87d8737fbe
Fixed error in admin/member_edit view

diff -r d0e12e1b8761 -r dbfde3c56790 app/main/admin/member_edit.lua
--- a/app/main/admin/member_edit.lua	Wed Apr 11 19:03:50 2012 +0200
+++ b/app/main/admin/member_edit.lua	Thu Apr 12 00:10:54 2012 +0200
@@ -8,11 +8,15 @@
   slot.put_into("title", encode.html(_"Register new member"))
 end
 
-local units = Unit:new_selector()
-  :add_field("privilege.voting_right", "voting_right")
-  :left_join("privilege", nil, { "privilege.member_id = ? AND privilege.unit_id = unit.id", member.id })
-  :exec()
+local units_selector = Unit:new_selector()
   
+if member then
+  units_selector
+    :left_join("privilege", nil, { "privilege.member_id = ? AND privilege.unit_id = unit.id", member.id })
+    :add_field("privilege.voting_right", "voting_right")
+end
+
+local units = units_selector:exec()
   
 ui.form{
   attr = { class = "vertical" },
diff -r d0e12e1b8761 -r dbfde3c56790 app/main/admin/unit_list.lua
--- a/app/main/admin/unit_list.lua	Wed Apr 11 19:03:50 2012 +0200
+++ b/app/main/admin/unit_list.lua	Thu Apr 12 00:10:54 2012 +0200
@@ -16,8 +16,20 @@
   columns = {
     {
       label = "name",
+      name = "name"
+    },
+    {
       content = function(unit)
-        ui.link{ text = unit.name, module = "admin", view = "area_list", params = { unit_id = unit.id } }
+        ui.link{
+          attr = { class = "action admin_only" },
+          text = _"Edit unit",
+          module = "admin", view = "unit_edit", id = unit.id
+        }
+        ui.link{
+          attr = { class = "action admin_only" },
+          text = _"Edit areas",
+          module = "admin", view = "area_list", params = { unit_id = unit.id }
+        }
       end 
     }
   }