From 791062569dfca01a405637fa9ba142c222d3310c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 24 Aug 2008 15:12:20 +0000 Subject: [PATCH 1/1] Tidy up diary code a bit. --- app/controllers/diary_entry_controller.rb | 21 ++++-- app/views/diary_entry/edit.rhtml | 2 + app/views/diary_entry/list.rhtml | 4 +- app/views/diary_entry/new.rhtml | 79 ----------------------- app/views/user/view.rhtml | 2 +- config/routes.rb | 2 +- 6 files changed, 20 insertions(+), 90 deletions(-) delete mode 100644 app/views/diary_entry/new.rhtml diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 0ad71da17..21c817414 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -6,30 +6,37 @@ class DiaryEntryController < ApplicationController before_filter :check_database_availability def new - @title = 'new diary entry' + @title = 'New diary entry' + if params[:diary_entry] @diary_entry = DiaryEntry.new(params[:diary_entry]) @diary_entry.user = @user + if @diary_entry.save redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name + else + render :action => 'edit' end + else + render :action => 'edit' end end def edit - @title= 'edit diary entry' + @title= 'Edit diary entry' @diary_entry = DiaryEntry.find(params[:id]) + if @user != @diary_entry.user - redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] - end - if params[:diary_entry] + redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] + elsif params[:diary_entry] @diary_entry.title = params[:diary_entry][:title] @diary_entry.body = params[:diary_entry][:body] @diary_entry.latitude = params[:diary_entry][:latitude] @diary_entry.longitude = params[:diary_entry][:longitude] + if @diary_entry.save redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id] - end + end end end @@ -44,7 +51,7 @@ class DiaryEntryController < ApplicationController render :action => 'view' end end - + def list if params[:display_name] @this_user = User.find_by_display_name(params[:display_name]) diff --git a/app/views/diary_entry/edit.rhtml b/app/views/diary_entry/edit.rhtml index 0a5203a66..87f5e9fac 100644 --- a/app/views/diary_entry/edit.rhtml +++ b/app/views/diary_entry/edit.rhtml @@ -1,3 +1,5 @@ +

<%= @title %>

+ <%= error_messages_for 'diary_entry' %> <% form_for :diary_entry do |f| %> diff --git a/app/views/diary_entry/list.rhtml b/app/views/diary_entry/list.rhtml index e648e46f2..7a2ccf74d 100644 --- a/app/views/diary_entry/list.rhtml +++ b/app/views/diary_entry/list.rhtml @@ -8,11 +8,11 @@ <% if @this_user %> <% if @user == @this_user %> - <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> <% else %> <% if @user %> - <%= link_to 'New diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> + <%= link_to 'New diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> <% end %> <% end %> diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml deleted file mode 100644 index 0a5203a66..000000000 --- a/app/views/diary_entry/new.rhtml +++ /dev/null @@ -1,79 +0,0 @@ -<%= error_messages_for 'diary_entry' %> - -<% form_for :diary_entry do |f| %> - - - - - - - - - - - - - - - - - -
Subject<%= f.text_field :title, :size => 60 %>
Body<%= f.text_area :body, :cols => 80 %>
Location - - Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %> - use map -
<%= submit_tag 'Save' %>
-<% end %> - -<% if @user.home_lat.nil? or @user.home_lon.nil? %> - <% lon = h(params['lon'] || '-0.1') %> - <% lat = h(params['lat'] || '51.5') %> - <% zoom = h(params['zoom'] || '4') %> -<% else %> - <% lon = @user.home_lon %> - <% lat = @user.home_lat %> - <% zoom = '12' %> -<% end %> - -<%= javascript_include_tag '/openlayers/OpenLayers.js' %> -<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %> -<%= javascript_include_tag 'map.js' %> - - diff --git a/app/views/user/view.rhtml b/app/views/user/view.rhtml index 3ee8ecb86..438de836d 100644 --- a/app/views/user/view.rhtml +++ b/app/views/user/view.rhtml @@ -3,7 +3,7 @@
<% if @user and @this_user.id == @user.id %> <%= link_to 'my diary', :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %> -| <%= link_to 'new diary post', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> +| <%= link_to 'new diary entry', :controller => 'diary_entry', :action => 'new', :display_name => @user.display_name %> | <%= link_to 'my traces', :controller => 'trace', :action=>'mine' %> | <%= link_to 'my settings', :controller => 'user', :action => 'account', :display_name => @user.display_name %> <% else %> diff --git a/config/routes.rb b/config/routes.rb index 7a06445ea..f040e1c1d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -129,7 +129,7 @@ ActionController::Routing::Routes.draw do |map| map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/ map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/ map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss' - map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new' + map.connect '/user/:display_name/diary/new', :controller => 'diary_entry', :action => 'new' map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/ map.connect '/user/:display_name/account', :controller => 'user', :action => 'account' map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home' -- 2.43.2