1.1 --- a/app/main/admin/cancel_issue.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/admin/cancel_issue.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,38 +1,39 @@
     1.4 -
     1.5  local id = param.get("id")
     1.6  
     1.7  if not id then
     1.8 -  ui.title("Cancel issue")
     1.9 -  ui.actions()
    1.10 -  ui.form{
    1.11 -    module = "admin",
    1.12 -    view = "cancel_issue",
    1.13 -    content = function()
    1.14 -      ui.field.text{ label = _"Issue ID", name = "id" }
    1.15 -      ui.submit{ text = _"Cancel issue" }
    1.16 -    end
    1.17 -  }
    1.18 -else
    1.19 - 
    1.20 -  local issue = Issue:by_id(id)
    1.21 - 
    1.22 -  ui.title(_("Cancel issue #{id}", { id = issue.id }))
    1.23 -  ui.actions()
    1.24 +  return
    1.25 +end
    1.26 +
    1.27 +local issue = Issue:by_id(id)
    1.28 +issue:load_everything_for_member_id ( app.session.member_id )
    1.29 +issue.initiatives:load_everything_for_member_id ( app.session.member_id )
    1.30 +
    1.31 +ui.titleAdmin(_"Cancel issue")
    1.32  
    1.33 +ui.form{
    1.34 +  module = "admin",
    1.35 +  action = "cancel_issue",
    1.36 +  id = id,
    1.37 +  attr = { class = "vertical section" },
    1.38 +  content = function()
    1.39      
    1.40 -  execute.view{ module = "initiative", view = "_list", params = {
    1.41 -    initiatives_selector = issue:get_reference_selector("initiatives")
    1.42 -  } }
    1.43 +    ui.sectionHead( function()
    1.44 +      ui.heading { level = 1, content = _("Cancel issue ##{id}", { id = issue.id }) }
    1.45 +    end )
    1.46  
    1.47 -  ui.form{
    1.48 -    module = "admin",
    1.49 -    action = "cancel_issue",
    1.50 -    id = id,
    1.51 -    attr = { class = "vertical" },
    1.52 -    content = function()
    1.53 -      ui.field.text{ label = _"Public administrative notice:", name = "admin_notice", multiline = true }
    1.54 -      ui.submit{ text = _"Cancel issue now" }
    1.55 -    end
    1.56 -  }
    1.57 +    ui.sectionRow( function()
    1.58 +      execute.view{ module = "initiative", view = "_list", params = {
    1.59 +        issue = issue,
    1.60 +        initiatives = issue.initiatives
    1.61 +      } }
    1.62 +    end )
    1.63 +    
    1.64 +    ui.sectionRow( function()
    1.65 +      ui.field.text{ label = _"public administrative notice:", name = "admin_notice", multiline = true }
    1.66 +      ui.submit{ text = _"cancel issue now" }
    1.67 +      slot.put(" ")
    1.68 +      ui.link { module = "admin", view = "index", content = "go back to safety" }
    1.69 +    end )
    1.70 +  end
    1.71 +}
    1.72  
    1.73 -end