mirror of
https://github.com/TracksApp/tracks.git
synced 2026-02-16 04:08:08 +01:00
This is a bit of a messy commit ;-)
* Moved the forms (for edit and add_item) into a partial, which saves some time. It's not as clean as I would like. * Added some caching back in. * Error message display still isn't working, so I've taken those code stubs out for now. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@15 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
parent
ed4481f3b6
commit
36b36e8dac
13 changed files with 103 additions and 122 deletions
|
|
@ -14,6 +14,7 @@ class TodoController < ApplicationController
|
|||
@page_title = "List tasks"
|
||||
@projects = Project.find_all
|
||||
@places = Context.find_all( "hide=0", "id ASC")
|
||||
@hidden_places = Context.find_all( "hide=1")
|
||||
@done = Todo.find_all( "done=1", "completed DESC", 5 )
|
||||
@count = Todo.count( "done=0" )
|
||||
end
|
||||
|
|
@ -32,33 +33,23 @@ class TodoController < ApplicationController
|
|||
#
|
||||
def add_item
|
||||
@item = Todo.new
|
||||
@item.attributes = @params["new_item"]
|
||||
@item.attributes = @params["item"]
|
||||
|
||||
# Convert the date format entered (as set in config/settings.yml)
|
||||
# to the mysql format YYYY-MM-DD
|
||||
if @params["new_item"]["due"] != ""
|
||||
if @params["item"]["due"] != ""
|
||||
date_fmt = app_configurations["formats"]["date"]
|
||||
formatted_date = DateTime.strptime(@params["new_item"]["due"], "#{date_fmt}")
|
||||
formatted_date = DateTime.strptime(@params["item"]["due"], "#{date_fmt}")
|
||||
@item.due = formatted_date.strftime("%Y-%m-%d")
|
||||
else
|
||||
@item.due = "0000-00-00"
|
||||
end
|
||||
|
||||
# This doesn't seem to be working. No error, but the error
|
||||
# message isn't printed either.
|
||||
unless @item.errors.empty?
|
||||
error_msg = ''
|
||||
@item.errors.each_full do |message|
|
||||
error_msg << message
|
||||
end
|
||||
return error_msg
|
||||
end
|
||||
|
||||
if @item.save
|
||||
if @item.save
|
||||
flash["confirmation"] = "Next action was successfully added"
|
||||
redirect_to( :action => "list" )
|
||||
else
|
||||
flash["warning"] = "Couldn't add the action because of an error: #{error_msg}"
|
||||
flash["warning"] = "Couldn't add the action because of an error"
|
||||
redirect_to( :action => "list" )
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue