Fixed button order and initial page revision creator

app/controllers/editors_controller.rb

@@ -57,7 +57,7 @@ def create
       user_class_id = params[:user_options].delete(:user_class_id) if params[:user_options]
       @user = EndUser.new(params[:user_options])
 
-      if request.post?
+      if request.post? && params[:commit]
 	@user.user_class_id = user_class_id
         @user.registered = true
         @user.user_level = 3
@@ -67,6 +67,8 @@ def create
           redirect_to :action => 'index'
           return
         end
+      elsif request.post?
+        return redirect_to :action => 'index'
       end
 
      render :action => 'edit'
@@ -82,7 +84,7 @@ def edit
     user_class_id = params[:user_options].delete(:user_class_id) if params[:user_options]
     @user = EndUser.find(user_id)
 
-    if request.post?
+    if request.post? && params[:commit]
       @user.user_class_id = user_class_id
       if @user.update_attributes(params[:user_options])
         @user.update_domain_emails
@@ -91,6 +93,8 @@ def edit
         redirect_to :action =>'index'
         return
       end
+    elsif request.post?
+      return redirect_to :action => 'index'
     end
 
     @editing=true

app/controllers/structure_controller.rb

@@ -154,7 +154,7 @@ def add_modifier
     modifier_type = params[:modifier_type]
 
     node = SiteNode.find(parent_id)
-    md = node.add_modifier(modifier_type)
+    md = node.add_modifier(modifier_type, :created_by_id => myself.id)
 
     render :partial => 'site_node_modifier', :locals => { :mod => md }
   end
@@ -185,6 +185,7 @@ def add_node
 
         node = SiteNode.new({ :node_type => node_type,
                               :title => title,
+                              :created_by_id => myself.id,
                               :site_version_id => parent_node.site_version_id,
                               :module_name => module_name })
       else
@@ -193,17 +194,14 @@ def add_node
       end
     else
       node = SiteNode.new({ :node_type => node_type,
+                            :created_by_id => myself.id,
                             :site_version_id => parent_node.site_version_id,
                             :title => title })
     end
 
     node.save
     node.move_to_child_of(parent_node)
 
-    if node_type == 'P'
-      node.page_revisions[0].update_attributes(:created_by => myself)
-    end
-
     render :partial => 'path', :locals => { :paths => [node] }
 
   end

app/models/page_revision.rb

@@ -5,8 +5,8 @@ class PageRevision < DomainModel
   belongs_to :revision_container,  :polymorphic => true
   has_many :page_paragraphs, :dependent => :destroy, :order => 'zone_idx,position'
 
-  belongs_to :created_by, :polymorphic => true
-  belongs_to :updated_by, :polymorphic => true
+  belongs_to :created_by, :class_name => 'EndUser'
+  belongs_to :updated_by, :class_name => 'EndUser'
 
   belongs_to :parent_revision, :class_name => "PageRevision", :foreign_key => 'parent_revision_id'
 

app/models/site_node.rb

@@ -40,6 +40,8 @@ class SiteNode < DomainModel
 
   named_scope :with_type, lambda { |type| {:conditions => {:node_type => type}} }
 
+  attr_accessor :created_by_id
+
   # Expires the entire site when save or deleted
   expires_site
 
@@ -113,8 +115,8 @@ def self.node_path(page_id,default_url=nil)
 
 
   # Adds a modifier to this nodes list of modifiers
-  def add_modifier(type)
-    returning md = self.site_node_modifiers.create(:modifier_type => type) do
+  def add_modifier(type,options={})
+    returning md = self.site_node_modifiers.create(options.merge(:modifier_type => type)) do
       md.move_to_top
       if block_given?
         yield md
@@ -471,7 +473,7 @@ class GroupNodeOptions < NodeOptions
 
   def after_create #:nodoc:
     if self.node_type == 'P'
-      self.page_revisions.create( :language => Configuration.languages[0], :revision => '0.01', :active => 1 )
+      self.page_revisions.create( :language => Configuration.languages[0], :revision => '0.01', :active => 1, :created_by_id => self.created_by_id )
       self.page_revisions[0].page_paragraphs.create(:display_type => 'html', :zone_idx => 1 )
     elsif self.node_type == 'J'
       redirect_detail = self.create_redirect_detail(:redirect_type => 'site_node')

app/models/site_node_modifier.rb

@@ -17,6 +17,8 @@ class SiteNodeModifier < DomainModel
 
   include SiteAuthorizationEngine::Target
   access_control :access
+
+  attr_accessor :created_by_id
 
   def before_create #:nodoc:
     if opts = self.modifier_options
@@ -62,7 +64,7 @@ def create_temporary_revision(revision_id)
 
   def after_create
     if self.modifier_type == 'F' || self.modifier_type == 'framework'
-      self.page_revisions.create( :language => Configuration.languages[0], :revision => '0.01' , :active => true)
+      self.page_revisions.create( :language => Configuration.languages[0], :revision => '0.01' , :active => true, :created_by_id => self.created_by_id )
     end
   end
 

app/views/editors/edit.rhtml

@@ -1,5 +1,5 @@
 <div class='admin_content'>
-<% cms_form_for :user_options, @user, :html => {:class => 'admin_form' } do |f| %>
+  <% cms_form_for :user_options, @user, :html => {:class => 'admin_form', :autocomplete => 'off' } do |f| %>
 
 <%= f.text_field :email %>
 <%= f.text_field :first_name %>
@@ -12,6 +12,6 @@
 <%= f.password_field :password %>
 <%= f.password_field :password_confirmation, :label => 'Confirm' %>
 
-<%= f.submit_cancel_tags 'Submit','Cancel', {}, { :onclick => "document.location='#{url_for :action => 'index' }'; return false;" } %>
+<%= f.cancel_submit_buttons %>
 <% end -%>
 </div>

app/views/members/edit.rhtml

@@ -63,7 +63,7 @@ MemberEditor = {
 <table>
 <tr>
 <td>
-<% cms_form_for :user_options, @user, :html => { :class => 'admin_form' }  do |f| %>
+  <% cms_form_for :user_options, @user, :html => { :class => 'admin_form', :autocomplete => 'off' }  do |f| %>
 
 <%= f.text_field :email, :required => true %>
 <%= f.text_field :first_name %>