diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-06 16:43:44 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-03-06 16:43:44 +0100 |
commit | 99b0b74ac87c77b5f39e21c65141d8fcc6753ca2 (patch) | |
tree | 476753a86702e468c8dc4f6dca677618ec07518d /nixops/modules/task/fixes.patch | |
parent | 55fd3780b5c40664233cd3f9b8cf280bd530fdd1 (diff) | |
download | Nix-99b0b74ac87c77b5f39e21c65141d8fcc6753ca2.tar.gz Nix-99b0b74ac87c77b5f39e21c65141d8fcc6753ca2.tar.zst Nix-99b0b74ac87c77b5f39e21c65141d8fcc6753ca2.zip |
Add taskwarrior-web
Fixes https://git.immae.eu/mantisbt/view.php?id=67
Diffstat (limited to 'nixops/modules/task/fixes.patch')
-rw-r--r-- | nixops/modules/task/fixes.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/nixops/modules/task/fixes.patch b/nixops/modules/task/fixes.patch new file mode 100644 index 0000000..851f9f0 --- /dev/null +++ b/nixops/modules/task/fixes.patch | |||
@@ -0,0 +1,56 @@ | |||
1 | diff --git a/lib/taskwarrior-web/helpers.rb b/lib/taskwarrior-web/helpers.rb | ||
2 | index 212aed7..94c57df 100644 | ||
3 | --- a/lib/taskwarrior-web/helpers.rb | ||
4 | +++ b/lib/taskwarrior-web/helpers.rb | ||
5 | @@ -1,6 +1,8 @@ | ||
6 | require 'active_support/core_ext/date/calculations' | ||
7 | |||
8 | module TaskwarriorWeb::App::Helpers | ||
9 | + include ERB::Util | ||
10 | + | ||
11 | def format_date(timestamp) | ||
12 | format = TaskwarriorWeb::Config.dateformat || '%-m/%-d/%Y' | ||
13 | Time.parse(timestamp).localtime.strftime(format) | ||
14 | diff --git a/lib/taskwarrior-web/services/builder/base.rb b/lib/taskwarrior-web/services/builder/base.rb | ||
15 | index 58d246e..8f716ac 100644 | ||
16 | --- a/lib/taskwarrior-web/services/builder/base.rb | ||
17 | +++ b/lib/taskwarrior-web/services/builder/base.rb | ||
18 | @@ -10,7 +10,7 @@ module TaskwarriorWeb::CommandBuilder::Base | ||
19 | :complete => ':id done', | ||
20 | :annotate => ':id annotate', | ||
21 | :denotate => ':id denotate', | ||
22 | - :projects => '_projects', | ||
23 | + :projects => '_unique project', | ||
24 | :tags => '_tags', | ||
25 | :sync => 'sync' | ||
26 | } | ||
27 | diff --git a/lib/taskwarrior-web/views/tasks/_form.erb b/lib/taskwarrior-web/views/tasks/_form.erb | ||
28 | index 789e7a1..fa08698 100644 | ||
29 | --- a/lib/taskwarrior-web/views/tasks/_form.erb | ||
30 | +++ b/lib/taskwarrior-web/views/tasks/_form.erb | ||
31 | @@ -1,14 +1,14 @@ | ||
32 | <div class="control-group"> | ||
33 | <label for="task-description" class="control-label">Description</label> | ||
34 | <div class="controls"> | ||
35 | - <input type="text" required="required" id="task-description" name="task[description]" value="<%= @task.description unless @task.nil? %>" /> | ||
36 | + <input type="text" required="required" id="task-description" name="task[description]" value="<%=h @task.description unless @task.nil? %>" /> | ||
37 | </div> | ||
38 | </div> | ||
39 | |||
40 | <div class="control-group"> | ||
41 | <label for="task-project" class="control-label">Project</label> | ||
42 | <div class="controls"> | ||
43 | - <input type="text" id="task-project" name="task[project]" value="<%= @task.project unless @task.nil? %>" autocomplete="off" /> | ||
44 | + <input type="text" id="task-project" name="task[project]" value="<%=h @task.project unless @task.nil? %>" autocomplete="off" /> | ||
45 | </div> | ||
46 | </div> | ||
47 | |||
48 | @@ -45,7 +45,7 @@ | ||
49 | <div class="control-group"> | ||
50 | <label for="task-tags" class="control-label">Tags</label> | ||
51 | <div class="controls"> | ||
52 | - <input type="text" id="task-tags" name="task[tags]" value="<%= @task.tags.join(', ') unless @task.nil? %>" autocomplete="off" /> | ||
53 | + <input type="text" id="task-tags" name="task[tags]" value="<%=h @task.tags.join(', ') unless @task.nil? %>" autocomplete="off" /> | ||
54 | <span class="help-block">Enter tags separated by commas or spaces (e.g. <em>each, word will,be a tag</em>)</span> | ||
55 | </div> | ||
56 | </div> | ||