Made events/new and events/update location creation/editing

more betterer with some magical javscript. 

Removed this task from the TODO list. Also removed an old 
item I don't care about anymore (index caching), and moved 
another item to the IDEAS file.


git-svn-id: http://svn.pdxruby.org/repos/www/trunk@209 f0fbaf97-c700-0410-a5eb-8ea856f8537e

Author: caleb

app/controllers/events_controller.rb

@@ -7,6 +7,10 @@ def index
     render :action => 'list'
   end
 
+  def add_location
+    render :layout => false
+  end
+
   def list
     @event_pages, @events = paginate :event, :per_page => 10, :order_by => 'starts_at DESC'
   end
@@ -36,7 +40,7 @@ def new
   def create
     @event = Event.new(params[:event])
     @event.member = session[:member]
-    if params[:event][:location_id] == ""
+    if params[:event][:location_id].nil?
       location = Location.find_by_name(params[:location][:name])
       if location.nil?
         location = Location.new(params[:location]) 
@@ -82,6 +86,23 @@ def update
 	redirect_to :action => 'list'
 	return
     end
+
+    # deal with updates to location
+    if params[:event][:location_id].nil?
+      location = Location.find_by_name(params[:location][:name])
+      if location.nil?
+        location = Location.new(params[:location]) 
+        unless location.save
+          @location = location
+          render :action => 'new' and return
+        end
+      end
+      @location = location
+    else
+      @location = Location.find(params[:event][:location_id].to_i)
+    end
+    @event.location = @location
+
     if @event.update_attributes(params[:event])
       flash[:notice] = 'Event was successfully updated.'
       MailBot::deliver_change_message(self, @event) if params[:trivial].nil?

app/views/events/_form.rhtml

@@ -1,13 +1,15 @@
 <%= error_messages_for 'event' %>
+<%= error_messages_for 'location' %>
 
 <!--[form:event]-->
 <p><label for="event_name">Name</label><br/>
 <%= text_field 'event', 'name'  %></p>
 
-<p><label for="location_id">Location (leave blank for other)</label><br/>
-<%= collection_select 'event', 'location_id', Location.find(:all), :id, :name, {:include_blank => true }  %>
-
-<%= render :partial => "locations/form" %>
+<div id="location_select">
+<p><label for="location_id">Location (leave blank for other)</label><br />
+<%= collection_select 'event', 'location_id', Location.find(:all), :id, :name  %>
+<%= link_to_remote "Add New", :update => 'location_select', :url => { :action => "add_location" } %>
+</div>
 
 <p><label for="event_starts_at">Starts at</label><br/>
 <%= datetime_select 'event', 'starts_at'  %></p>

app/views/events/add_location.rhtml

@@ -0,0 +1,11 @@
+<!--[form:location]-->
+<p><label for="location_name">Location Name</label><br/>
+<%= text_field 'location', 'name'  %></p>
+
+<p><label for="location_address">Location Address</label><br/>
+<%= text_area 'location', 'address'  %></p>
+
+<p><label for="location_homepage">Location Homepage</label><br/>
+<%= text_field 'location', 'homepage'  %></p>
+
+<!--[eoform:location]-->

app/views/layouts/application.rhtml

@@ -6,8 +6,9 @@
   	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   	<meta http-equiv="Content-Language" content="en-us">
   	<meta name="copyright" content="(c) Copyright 2005 John Labovitz">
-	  <%= stylesheet_link_tag 'stylesheet' %>
-    <%= stylesheet_link_tag 'scaffold' %>
+        <%= stylesheet_link_tag 'stylesheet' %>
+        <%= stylesheet_link_tag 'scaffold' %>
+        <%= javascript_include_tag 'prototype' %>
   	<title>The Portland Ruby Brigade (PDX.rb)</title>
   </head>
 

doc/IDEAS

@@ -20,6 +20,15 @@ _Community Stuff_
 
   - poll for event location (suggested by bleything on the dev list)
 
+  - It would be nice if the feeds could be moderated by people. If one
+    person posts a bunch of off-topic entries, then the last 5 isn't very
+    Ruby-based. Currently, a user can delete his or her own articles, which is probably
+    good-enough for a little while.
+        - Perhaps a field should be added to the articles relation
+          that contains the number of 'nay' votes. When some threshold
+          is reached, the article is not shown (but not deleted - if
+          it were, the feeder would just grab it again next run)
+
 _UI Stuff_
 
   - "calender view" for events, perhaps week-at-a-time too

doc/TODO

@@ -13,15 +13,6 @@ _Spamming_
 
 _Other_
 
-  - Bug in location view code when editing an event. Prevented me from 
-    adding minutes for the April Monthly. The whole location part of the
-    event form really needs some TLC. If nothing else, it is confusing.
-    (we can't make this happen in the latest code, so it may not be a bug anymore)
-
-  - Cache index page. How should this be done? Periodically or when some set of DB modifications
-    occurs (i.e. when scripts/feeder runs, and when an event is added or deleted or modified). Ideally
-    the index should be able to handle a slashdotting.
-
   - User should be able to delete their own account...
 
   - Validation for Article, plus tests to match.
@@ -31,9 +22,6 @@ _Other_
 
 _Cosmetic_
 
-  - on Edit/New Event, when existing location is selected, alternative location
-    inputs can be greyed-out or dissapeared (via some Javascript magic).
- 
   - Make timestamps prettier (this and following 2 items suggested by bleything on dev-list)
 
   - Article list enhancements (sort by author, etc.)
@@ -47,14 +35,3 @@ _Testing_
   - write functional tests for index_controller.rb
   - write functional tests for locations_controller.rb
   - write functional tests for participants_controller.rb
-
-_Feeds_
-
-  - It would be nice if the feeds could be moderated by people. If one
-    person posts a bunch of off-topic entries, then the last 5 isn't very
-    Ruby-based. Currently, a user can delete his or her own articles, which is probably
-    good-enough for a little while.
-    	- Perhaps a field should be added to the articles relation
-	  that contains the number of 'nay' votes. When some threshold
-	  is reached, the article is not shown (but not deleted - if
-	  it were, the feeder would just grab it again next run)