From 9c28bc737cbba91b55377fba18c77dc19de7ee19 Mon Sep 17 00:00:00 2001
From: scripty <scripty@vrtec>
Date: Sat, 21 Jan 2017 00:30:47 +0100
Subject: [PATCH 1/3] make drag&drop todos from/to contexts work again

---
 app/controllers/todos_controller.rb | 2 +-
 app/helpers/todos_helper.rb         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 36cc7435..197245b0 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -397,7 +397,7 @@ class TodosController < ApplicationController
     @todo = current_user.todos.find(params[:id])
     @original_item_context_id = @todo.context_id
     @original_item = current_user.todos.build(@todo.attributes)  # create a (unsaved) copy of the original todo
-    @context = current_user.contexts.find(params[:todo][:context_id])
+    @context = current_user.contexts.find(params[:todo][:context_id].sub! 'c', '')
     @todo.context = @context
     @saved = @todo.save
 
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 750ace39..6f08c9f7 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -118,6 +118,7 @@ module TodosHelper
       toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : ""
       "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe
     end
+    header += content_tag(:div, nil, :id =>"c_"+settings[:id]+"_target", :class=>"context_target drop_target")
     header.html_safe
   end
 

From 1e0f1bd611d0ce2e356d9f975d3a09ef95e17ec6 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Wed, 22 May 2019 01:28:50 +0300
Subject: [PATCH 2/3] Change context element IDs to use underscore instead of
 just the c prefix

---
 app/assets/javascripts/tracks.js.erb | 2 +-
 app/helpers/todos_helper.rb          | 2 +-
 app/views/contexts/_context.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index 80813d5f..02da5979 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -644,7 +644,7 @@ var ContextListPage = {
         }
     },
     save_context_name: function(value, settings) {
-        var context_id = $(this).parents('.container.context').get(0).id.split('c')[1];
+        var context_id = $(this).parents('.container.context').get(0).id.split('_')[1];
         var highlight = function(){
             $('div.context span#context_name').effect('highlight', {}, 500);
         };
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 6f08c9f7..a2291bdb 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -118,7 +118,7 @@ module TodosHelper
       toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : ""
       "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe
     end
-    header += content_tag(:div, nil, :id =>"c_"+settings[:id]+"_target", :class=>"context_target drop_target")
+    header += content_tag(:div, nil, :id => settings[:id] + "_target", :class => "context_target drop_target")
     header.html_safe
   end
 
diff --git a/app/views/contexts/_context.html.erb b/app/views/contexts/_context.html.erb
index 1263d671..a0921254 100644
--- a/app/views/contexts/_context.html.erb
+++ b/app/views/contexts/_context.html.erb
@@ -8,7 +8,7 @@ cache [context, source_view_key, current_user.date.strftime("%Y%m%d"), @tag_name
     render :partial => 'todos/collection',
       :object => @not_done,
       :locals => { :settings => {
-        :id => "c#{context.id}",
+        :id => "context_#{context.id}",
         :collapsible => settings[:collapsible],
         :container_name => 'context',
         :title => show_context_name(context),

From 359f615bf7ae7e40c16cf8fb8d5df3f6e321f825 Mon Sep 17 00:00:00 2001
From: Jyri-Petteri Paloposki <jyri-petteri.paloposki@iki.fi>
Date: Wed, 22 May 2019 01:31:26 +0300
Subject: [PATCH 3/3] Remove unnecessary string manipulation

---
 app/controllers/todos_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 197245b0..36cc7435 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -397,7 +397,7 @@ class TodosController < ApplicationController
     @todo = current_user.todos.find(params[:id])
     @original_item_context_id = @todo.context_id
     @original_item = current_user.todos.build(@todo.attributes)  # create a (unsaved) copy of the original todo
-    @context = current_user.contexts.find(params[:todo][:context_id].sub! 'c', '')
+    @context = current_user.contexts.find(params[:todo][:context_id])
     @todo.context = @context
     @saved = @todo.save