@@ -152,7 +152,8 @@ class Admin::ArticlesController < Admin::BaseController raise t(:'adva.articles.exception.missing_timestamp') end - if @article.updated_at && (Time.zone.parse(updated_at) != @article.updated_at) + # We parse the timestamp of article too so we can get rid of those microseconds postgresql adds + if @article.updated_at && (Time.zone.parse(updated_at) != Time.zone.parse(@article.updated_at.to_s)) flash[:error] = t(:'adva.articles.flash.optimistic_lock.failure') render :action => :edit end engines/adva_cms/app/controllers/admin/articles_controller.rb @@ -100,13 +100,14 @@ class Admin::WikipagesController < Admin::BaseController def optimistic_lock return unless params[:wikipage] - + unless updated_at = params[:wikipage].delete(:updated_at) # TODO raise something more explicit here raise t(:'adva.wiki.exception.missing_timestamp') end - - if @wikipage.updated_at && (Time.zone.parse(updated_at) != @wikipage.updated_at) + + # We parse the timestamp of wikipage too so we can get rid of those microseconds postgresql adds + if @wikipage.updated_at && (Time.zone.parse(updated_at) != Time.zone.parse(@wikipage.updated_at.to_s)) flash[:error] = t(:'adva.wiki.flash.optimistic_lock.failure') render :action => :edit end engines/adva_wiki/app/controllers/admin/wikipages_controller.rb @@ -154,7 +154,8 @@ class WikiController < BaseController raise t(:'adva.wiki.exception.missing_timestamp') end - if @wikipage.updated_at && (Time.zone.parse(updated_at) != @wikipage.updated_at) + # We parse the timestamp of wikipage too so we can get rid of those microseconds postgresql adds + if @wikipage.updated_at && (Time.zone.parse(updated_at) != Time.zone.parse(@wikipage.updated_at.to_s)) flash[:error] = t(:'adva.wiki.flash.optimistic_lock.failure') render :action => :edit end engines/adva_wiki/app/controllers/wiki_controller.rb @@ -1,6 +1,7 @@ <h2><%= t(:'adva.wikipage.view.edit.header', :title => @wikipage.title) %></h2> <% split_form_for :wikipage, @wikipage, :url => admin_wikipage_path, :html => {:multipart => true, :method => :put, :id => 'content_form'} do |f| -%> + <%= f.hidden_field :updated_at, :value => @wikipage.updated_at %> <%= render :partial => "form", :locals => {:f => f} %> <% save_or_cancel_links(f, :cancel_url => admin_wikipage_path) %> engines/adva_wiki/app/views/admin/wikipages/edit.html.erb f7f814ea80c05e44c8baf6378e0bdb5d741f9bbc Marko Seppae marko.seppa@gmail.com http://github.com/svenfuchs/adva_cms/commit/032aec10e4044c76f26c71f246956f4111a06790 032aec10e4044c76f26c71f246956f4111a06790 2009-09-29T02:04:19-07:00 2009-09-29T02:04:19-07:00 fixed optimistic locking with postgresql - added timestamp field to admin wikipage edit form 5629bf42812277c2f4e8aeda92b486e98f01553f Marko Seppae marko.seppa@gmail.com