# HG changeset patch
# User bsw
# Date 1325210657 -3600
# Node ID ec86db5063126a1e978de9e8803e187cb11ca74f
# Parent  2dc13655afca57f72adc65a81bf19b30e401e292
Removed autoreject support (which was removed from core-2)

diff -r 2dc13655afca -r ec86db506312 app/main/interest/_action/update.lua
--- a/app/main/interest/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
+++ b/app/main/interest/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
@@ -26,11 +26,8 @@
   interest = Interest:new()
   interest.issue_id   = issue_id
   interest.member_id  = app.session.member_id
-  interest.autoreject = false
 end
 
-interest.autoreject = param.get("autoreject", atom.boolean)
-
 interest:save()
 
 slot.put_into("notice", _"Interest updated")
diff -r 2dc13655afca -r ec86db506312 app/main/interest/_show_box.lua
--- a/app/main/interest/_show_box.lua	Fri Dec 30 03:02:09 2011 +0100
+++ b/app/main/interest/_show_box.lua	Fri Dec 30 03:04:17 2011 +0100
@@ -12,7 +12,7 @@
     content = function()
         ui.container{
           attr = { 
-            class = "head head_active" .. (interest.autoreject and " head_autoreject" or ""),
+            class = "head head_active",
             onclick = "document.getElementById('interest_content').style.display = 'block';"
           },
           content = function()
@@ -21,20 +21,6 @@
             }
             slot.put(_"Your are interested")
 
-            if interest.autoreject == true or
-              (interest.autoreject == nil and membership and membership.autoreject == true)
-            then
-              ui.image{
-                static = "icons/16/thumb_down_red.png"
-              }
-            end
-
-            if interest.autoreject == false then
-              ui.image{
-                static = "icons/16/thumb_down_red_crossed.png"
-              }
-            end
-
             ui.image{
               static = "icons/16/dropdown.png"
             }
@@ -65,72 +51,6 @@
               slot.put("<br />")
               slot.put("<br />")
             end
-            if interest.autoreject == nil then
-              if membership then
-                if membership.autoreject then
-                  ui.field.text{ value = _"Autoreject is inherited from area. (Currently turned on)" }
-                else
-                  ui.field.text{ value = _"Autoreject is inherited from area. (Currently turned off)" }
-                end
-              else
-                ui.field.text{ value = _"Autoreject is inherited from area. (No member of this area)" }
-              end
-              slot.put("<br />")
-              if issue.state ~= "finished" and issue.state ~= "cancelled" then
-                ui.link{
-                  text    = _"Turn on autoreject for issue",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = true },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-                ui.link{
-                  text    = _"Turn off autoreject for issue",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = false },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-              end
-            elseif interest.autoreject == true then
-              ui.field.text{ value = _"Autoreject for this issue is turned on." }
-              slot.put("<br />")
-              if issue.state ~= "finished" and issue.state ~= "cancelled" then
-                ui.link{
-                  text    = _"Inherit autoreject from area",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = nil },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-                ui.link{
-                  text    = _"Turn off autoreject for issue",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = false },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-              end
-            elseif interest.autoreject == false then
-              ui.field.text{ value = _"Autoreject for this issue is turned off." }
-              slot.put("<br />")
-              if issue.state ~= "finished" and issue.state ~= "cancelled" then
-                ui.link{
-                  text    = _"Inherit autoreject from area",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = nil },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-                ui.link{
-                  text    = _"Turn on autoreject for issue",
-                  module  = "interest",
-                  action  = "update",
-                  params  = { issue_id = issue.id, autoreject = true },
-                  routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
-                }
-              end
-            end
           end
         }
       end
@@ -147,4 +67,4 @@
       routing = { default = { mode = "redirect", module = "issue", view = "show", id = issue.id } }
     }
   end
-end
\ No newline at end of file
+end
diff -r 2dc13655afca -r ec86db506312 app/main/membership/_action/update.lua
--- a/app/main/membership/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
+++ b/app/main/membership/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
@@ -15,12 +15,6 @@
   membership = Membership:new()
   membership.area_id    = area_id
   membership.member_id  = app.session.member_id
-  membership.autoreject = false
-end
-
-local autoreject = param.get("autoreject", atom.boolean)
-if autoreject ~= nil then
-  membership.autoreject = autoreject
 end
 
 membership:save()
diff -r 2dc13655afca -r ec86db506312 app/main/membership/_show_box.lua
--- a/app/main/membership/_show_box.lua	Fri Dec 30 03:02:09 2011 +0100
+++ b/app/main/membership/_show_box.lua	Fri Dec 30 03:04:17 2011 +0100
@@ -17,12 +17,6 @@
         }
         slot.put(_"You are member")
 
-        if membership.autoreject == true then
-          ui.image{
-            static = "icons/16/thumb_down_red.png"
-          }
-        end
-
         ui.image{
           static = "icons/16/dropdown.png"
         }
@@ -49,25 +43,6 @@
           params  = { area_id = area.id, delete = true },
           routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
         }
-        if membership.autoreject then
-          ui.field.text{ value = _"Autoreject is on." }
-          ui.link{
-            text    = _"Remove autoreject",
-            module  = "membership",
-            action  = "update",
-            params  = { area_id = area.id, autoreject = false },
-            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
-          }
-        else
-          ui.field.text{ value = _"Autoreject is off." }
-          ui.link{
-            text    = _"Set autoreject",
-            module  = "membership",
-            action  = "update",
-            params  = { area_id = area.id, autoreject = true },
-            routing = { default = { mode = "redirect", module = "area", view = "show", id = area.id } }
-          }
-        end
       end
     }
   else
diff -r 2dc13655afca -r ec86db506312 app/main/vote/_action/update.lua
--- a/app/main/vote/_action/update.lua	Fri Dec 30 03:02:09 2011 +0100
+++ b/app/main/vote/_action/update.lua	Fri Dec 30 03:04:17 2011 +0100
@@ -32,7 +32,6 @@
     direct_voter.member_id = app.session.member_id
   end
 
-  direct_voter.autoreject = false
   direct_voter:save()
 
   local scoring = param.get("scoring")