1.1 --- a/app/main/interest/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
     1.2 +++ b/app/main/interest/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
     1.3 @@ -26,11 +26,8 @@
     1.4    interest = Interest:new()
     1.5    interest.issue_id   = issue_id
     1.6    interest.member_id  = app.session.member_id
     1.7 -  interest.autoreject = false
     1.8  end
     1.9  
    1.10 -interest.autoreject = param.get("autoreject", atom.boolean)
    1.11 -
    1.12  interest:save()
    1.13  
    1.14  slot.put_into("notice", _"Interest updated")

     2.1 --- a/app/main/interest/_show_box.lua	Fri Dec 30 03:02:09 2011 +0100
     2.2 +++ b/app/main/interest/_show_box.lua	Fri Dec 30 03:04:17 2011 +0100
     2.3 @@ -12,7 +12,7 @@
     2.4      content = function()
     2.5          ui.container{
     2.6            attr = { 
     2.7 -            class = "head head_active" .. (interest.autoreject and " head_autoreject" or ""),
     2.8 +            class = "head head_active",
     2.9              onclick = "document.getElementById('interest_content').style.display = 'block';"
    2.10            },
    2.11            content = function()
    2.12 @@ -21,20 +21,6 @@
    2.13              }
    2.14              slot.put(_"Your are interested")
    2.15  
    2.16 -            if interest.autoreject == true or
    2.17 -              (interest.autoreject == nil and membership and membership.autoreject == true)
    2.18 -            then
    2.19 -              ui.image{
    2.20 -                static = "icons/16/thumb_down_red.png"
    2.21 -              }
    2.22 -            end
    2.23 -
    2.24 -            if interest.autoreject == false then
    2.25 -              ui.image{
    2.26 -                static = "icons/16/thumb_down_red_crossed.png"
    2.27 -              }
    2.28 -            end
    2.29 -
    2.30              ui.image{
    2.31                static = "icons/16/dropdown.png"
    2.32              }
    2.33 @@ -65,72 +51,6 @@
    2.34                slot.put("<br />")
    2.35                slot.put("<br />")
    2.36              end
    2.37 -            if interest.autoreject == nil then
    2.38 -              if membership then
    2.39 -                if membership.autoreject then
    2.40 -                  ui.field.text{ value = _"Autoreject is inherited from area. (Currently turned on)" }
    2.41 -                else
    2.42 -                  ui.field.text{ value = _"Autoreject is inherited from area. (Currently turned off)" }
    2.43 -                end
    2.44 -              else
    2.45 -                ui.field.text{ value = _"Autoreject is inherited from area. (No member of this area)" }
    2.46 -              end
    2.47 -              slot.put("<br />")
    2.48 -              if issue.state ~= "finished" and issue.state ~= "cancelled" then
    2.49 -                ui.link{
    2.50 -                  text    = _"Turn on autoreject for issue",
    2.51 -                  module  = "interest",
    2.52 -                  action  = "update",
    2.53 -                  params  = { issue_id = issue.id, autoreject = true },
    2.54 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    2.55 -                }
    2.56 -                ui.link{
    2.57 -                  text    = _"Turn off autoreject for issue",
    2.58 -                  module  = "interest",
    2.59 -                  action  = "update",
    2.60 -                  params  = { issue_id = issue.id, autoreject = false },
    2.61 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    2.62 -                }
    2.63 -              end
    2.64 -            elseif interest.autoreject == true then
    2.65 -              ui.field.text{ value = _"Autoreject for this issue is turned on." }
    2.66 -              slot.put("<br />")
    2.67 -              if issue.state ~= "finished" and issue.state ~= "cancelled" then
    2.68 -                ui.link{
    2.69 -                  text    = _"Inherit autoreject from area",
    2.70 -                  module  = "interest",
    2.71 -                  action  = "update",
    2.72 -                  params  = { issue_id = issue.id, autoreject = nil },
    2.73 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    2.74 -                }
    2.75 -                ui.link{
    2.76 -                  text    = _"Turn off autoreject for issue",
    2.77 -                  module  = "interest",
    2.78 -                  action  = "update",
    2.79 -                  params  = { issue_id = issue.id, autoreject = false },
    2.80 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    2.81 -                }
    2.82 -              end
    2.83 -            elseif interest.autoreject == false then
    2.84 -              ui.field.text{ value = _"Autoreject for this issue is turned off." }
    2.85 -              slot.put("<br />")
    2.86 -              if issue.state ~= "finished" and issue.state ~= "cancelled" then
    2.87 -                ui.link{
    2.88 -                  text    = _"Inherit autoreject from area",
    2.89 -                  module  = "interest",
    2.90 -                  action  = "update",
    2.91 -                  params  = { issue_id = issue.id, autoreject = nil },
    2.92 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
    2.93 -                }
    2.94 -                ui.link{
    2.95 -                  text    = _"Turn on autoreject for issue",
    2.96 -                  module  = "interest",
    2.97 -                  action  = "update",
    2.98 -                  params  = { issue_id = issue.id, autoreject = true },
    2.99 -                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   2.100 -                }
   2.101 -              end
   2.102 -            end
   2.103            end
   2.104          }
   2.105        end
   2.106 @@ -147,4 +67,4 @@
   2.107        routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
   2.108      }
   2.109    end
   2.110 -end
   2.111 \ No newline at end of file
   2.112 +end

     3.1 --- a/app/main/membership/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
     3.2 +++ b/app/main/membership/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
     3.3 @@ -15,12 +15,6 @@
     3.4    membership = Membership:new()
     3.5    membership.area_id    = area_id
     3.6    membership.member_id  = app.session.member_id
     3.7 -  membership.autoreject = false
     3.8 -end
     3.9 -
    3.10 -local autoreject = param.get("autoreject", atom.boolean)
    3.11 -if autoreject ~= nil then
    3.12 -  membership.autoreject = autoreject
    3.13  end
    3.14  
    3.15  membership:save()

     4.1 --- a/app/main/membership/_show_box.lua	Fri Dec 30 03:02:09 2011 +0100
     4.2 +++ b/app/main/membership/_show_box.lua	Fri Dec 30 03:04:17 2011 +0100
     4.3 @@ -17,12 +17,6 @@
     4.4          }
     4.5          slot.put(_"You are member")
     4.6  
     4.7 -        if membership.autoreject == true then
     4.8 -          ui.image{
     4.9 -            static = "icons/16/thumb_down_red.png"
    4.10 -          }
    4.11 -        end
    4.12 -
    4.13          ui.image{
    4.14            static = "icons/16/dropdown.png"
    4.15          }
    4.16 @@ -49,25 +43,6 @@
    4.17            params  = { area_id = area.id, delete = true },
    4.18            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
    4.19          }
    4.20 -        if membership.autoreject then
    4.21 -          ui.field.text{ value = _"Autoreject is on." }
    4.22 -          ui.link{
    4.23 -            text    = _"Remove autoreject",
    4.24 -            module  = "membership",
    4.25 -            action  = "update",
    4.26 -            params  = { area_id = area.id, autoreject = false },
    4.27 -            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
    4.28 -          }
    4.29 -        else
    4.30 -          ui.field.text{ value = _"Autoreject is off." }
    4.31 -          ui.link{
    4.32 -            text    = _"Set autoreject",
    4.33 -            module  = "membership",
    4.34 -            action  = "update",
    4.35 -            params  = { area_id = area.id, autoreject = true },
    4.36 -            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
    4.37 -          }
    4.38 -        end
    4.39        end
    4.40      }
    4.41    else

     5.1 --- a/app/main/vote/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
     5.2 +++ b/app/main/vote/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
     5.3 @@ -32,7 +32,6 @@
     5.4      direct_voter.member_id = app.session.member_id
     5.5    end
     5.6  
     5.7 -  direct_voter.autoreject = false
     5.8    direct_voter:save()
     5.9  
    5.10    local scoring = param.get("scoring")