1.1 --- a/app/main/draft/new.lua	Tue Feb 11 15:24:36 2020 +0100
     1.2 +++ b/app/main/draft/new.lua	Tue Feb 11 15:29:46 2020 +0100
     1.3 @@ -390,7 +390,7 @@
     1.4                ui.link{
     1.5                  content = _"Cancel",
     1.6                  module = initiative and "initiative" or issue and "issue" or "index",
     1.7 -                view = area and "index" or "show",
     1.8 +                view = area and not issue and "index" or "show",
     1.9                  id = initiative_id or issue_id,
    1.10                  params = { area = area_id, unit = area and area.unit_id or nil },
    1.11                  attr = { class = "mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect" }

     2.1 --- a/app/main/issue/_sidebar_whatcanido.lua	Tue Feb 11 15:24:36 2020 +0100
     2.2 +++ b/app/main/issue/_sidebar_whatcanido.lua	Tue Feb 11 15:29:46 2020 +0100
     2.3 @@ -428,7 +428,7 @@
     2.4              end }
     2.5              ui.tag { tag = "li", content = function ()
     2.6                ui.link {
     2.7 -                module = "initiative", view = "new", 
     2.8 +                module = "draft", view = "new", 
     2.9                  params = { issue_id = issue.id },
    2.10                  content = _"start a new competing initiative"
    2.11                }