Removing before_update hook on events to check lock status, because i…

…t appears to conflict with version tracking.

app/controllers/admin_controller.rb

@@ -10,9 +10,9 @@ def events
 
   def lock_event
     @event = Event.find(params[:event_id])
-    if @event.locked
+    if @event.locked?
       @event.unlock_editing!
-      flash[:success] = "Unlocked event #{@event.title} (#{@event.id})"      
+      flash[:success] = "Unlocked event #{@event.title} (#{@event.id})"
     else
       @event.lock_editing!
       flash[:success] = "Locked event #{@event.title} (#{@event.id})"

app/models/event.rb

@@ -43,7 +43,6 @@ class Event < ActiveRecord::Base
 
   validates :title, :description, :url, blacklist: true
 
-  before_update :verify_lock_status
   before_destroy :verify_lock_status
 
   # Duplicates
@@ -225,6 +224,6 @@ def end_time_later_than_start_time
   end
 
   def verify_lock_status
-    return false if locked
+    return !locked
   end
 end

db/migrate/20150207231355_add_locked_status_to_events.rb

@@ -1,5 +1,5 @@
 class AddLockedStatusToEvents < ActiveRecord::Migration
   def change
-    add_column :events, :locked, :boolean
+    add_column :events, :locked, :boolean, :default => false
   end
 end