mirror of
https://github.com/TracksApp/tracks.git
synced 2026-04-18 01:59:02 +02:00
commit
5e8ce9f460
6 changed files with 8 additions and 8 deletions
|
|
@ -413,7 +413,7 @@ class TodosController < ApplicationController
|
||||||
@todo = current_user.todos.find(params['id'])
|
@todo = current_user.todos.find(params['id'])
|
||||||
@original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo
|
@original_item = current_user.todos.build(@todo.attributes) # create a (unsaved) copy of the original todo
|
||||||
|
|
||||||
cache_attributes_from_before_update # TODO: remove in favor of @orininal_item
|
cache_attributes_from_before_update # TODO: remove in favor of @original_item
|
||||||
|
|
||||||
update_tags
|
update_tags
|
||||||
update_project
|
update_project
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<%- object_name = unique_object_name_for("update_todo_#{@todo.id}") -%>
|
<%- object_name = unique_object_name_for("update_todo_#{@todo.id}") -%>
|
||||||
var <%=object_name%> = {
|
var <%=object_name%> = {
|
||||||
<%= render :partial => (@saved ? "update_succesfull" : "update_has_errors"), locals: {object_name: object_name} %>
|
<%= render :partial => (@saved ? "update_successful" : "update_has_errors"), locals: {object_name: object_name} %>
|
||||||
}
|
}
|
||||||
<%=object_name%>.animate();
|
<%=object_name%>.animate();
|
||||||
|
|
@ -542,7 +542,7 @@ en:
|
||||||
edit: Edit
|
edit: Edit
|
||||||
pending: Pending
|
pending: Pending
|
||||||
completed_actions_with: "Completed actions with the tag '%{tag_name}'"
|
completed_actions_with: "Completed actions with the tag '%{tag_name}'"
|
||||||
deleted_success: The action was deleted succesfully.
|
deleted_success: The action was deleted successfully.
|
||||||
completed_tasks_title: TRACKS::Completed tasks
|
completed_tasks_title: TRACKS::Completed tasks
|
||||||
feed_title_in_project: "in project '%{project}'"
|
feed_title_in_project: "in project '%{project}'"
|
||||||
clear_due_date: Clear due date
|
clear_due_date: Clear due date
|
||||||
|
|
@ -552,7 +552,7 @@ en:
|
||||||
show_on_date: Show on %{date}
|
show_on_date: Show on %{date}
|
||||||
recurrence_period: Recurrence period
|
recurrence_period: Recurrence period
|
||||||
deferred_actions_with: "Deferred actions with the tag '%{tag_name}'"
|
deferred_actions_with: "Deferred actions with the tag '%{tag_name}'"
|
||||||
recurring_deleted_success: The recurring action was deleted succesfully.
|
recurring_deleted_success: The recurring action was deleted successfully.
|
||||||
confirm_delete: "Are you sure that you want to delete the action '%{description}'?"
|
confirm_delete: "Are you sure that you want to delete the action '%{description}'?"
|
||||||
deferred_tasks_title: TRACKS::Tickler
|
deferred_tasks_title: TRACKS::Tickler
|
||||||
next_actions_title: Tracks - Next Actions
|
next_actions_title: Tracks - Next Actions
|
||||||
|
|
|
||||||
|
|
@ -761,7 +761,7 @@ es:
|
||||||
one: Defer one day
|
one: Defer one day
|
||||||
other: Defer %{count} days
|
other: Defer %{count} days
|
||||||
delete: Delete
|
delete: Delete
|
||||||
deleted_success: The action was deleted succesfully.
|
deleted_success: The action was deleted successfully.
|
||||||
delete_action: Delete action
|
delete_action: Delete action
|
||||||
delete_recurring_action_confirm: Are you sure that you want to delete the recurring
|
delete_recurring_action_confirm: Are you sure that you want to delete the recurring
|
||||||
action '%{description}'?
|
action '%{description}'?
|
||||||
|
|
@ -897,7 +897,7 @@ es:
|
||||||
recurring_action_deleted: Action was deleted. Because this action is recurring,
|
recurring_action_deleted: Action was deleted. Because this action is recurring,
|
||||||
a new action was added
|
a new action was added
|
||||||
recurring_action_saved: Recurring action saved
|
recurring_action_saved: Recurring action saved
|
||||||
recurring_deleted_success: The recurring action was deleted succesfully.
|
recurring_deleted_success: The recurring action was deleted successfully.
|
||||||
recurring_pattern_removed: El patrón de repetición se retira de %{count}
|
recurring_pattern_removed: El patrón de repetición se retira de %{count}
|
||||||
recurring_todos: Recurring todos
|
recurring_todos: Recurring todos
|
||||||
removed_predecessor: Removed %{successor} as dependency from %{predecessor}.
|
removed_predecessor: Removed %{successor} as dependency from %{predecessor}.
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ Feature: Edit a project
|
||||||
@javascript
|
@javascript
|
||||||
Scenario: I can describe the project using markup
|
Scenario: I can describe the project using markup
|
||||||
When I go to the "manage me" project
|
When I go to the "manage me" project
|
||||||
And I edit the project description to "_successfull outcome_: project is *done*"
|
And I edit the project description to "_successful outcome_: project is *done*"
|
||||||
Then I should see the italic text "successfull outcome" in the project description
|
Then I should see the italic text "successful outcome" in the project description
|
||||||
And I should see the bold text "done" in the project description
|
And I should see the bold text "done" in the project description
|
||||||
|
|
||||||
@javascript
|
@javascript
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue