imagine_cms 3.0.0.beta6 → 3.0.0.beta7

data/app/controllers/management/user_controller.rb

@@ -15,14 +15,14 @@ class Management::UserController < Management::ApplicationController
           redirect_to :action => 'login' and return false
         end
         session[:user_authenticated] = true
-      
+        
         session[:user_id] = test.id
         session[:user_username] = test.username
         session[:user_first_name] = test.first_name
         session[:user_last_name] = test.last_name
-      
+        
         complete_login(test)
-      
+        
         if params[:redirect_on_success]
           redirect_to params[:redirect_on_success] and return
         else
@@ -51,7 +51,7 @@ class Management::UserController < Management::ApplicationController
   
   def redirect_to_default(user)
     redirect_to UserRedirectAfterLogin and return if defined?(UserRedirectAfterLogin)
-    redirect_to :controller => '/manage/default', :action => 'index'
+    redirect_to :controller => '/management/default', :action => 'index'
   end
   
   

data/app/controllers/management/users_controller.rb

@@ -14,7 +14,13 @@ class Management::UsersController < Management::ApplicationController
   end
   
   def create
-    @user = User.new(params[:user])
+    @user = User.new
+    @user.username = params[:user][:username]
+    @user.first_name = params[:user][:first_name]
+    @user.last_name = params[:user][:last_name]
+    @user.email_address = params[:user][:email_address]
+    @user.password = params[:user][:password]
+    @user.password_confirmation = params[:user][:password_confirmation]
     @user.active = true
     
     if request.post?
@@ -28,15 +34,23 @@ class Management::UsersController < Management::ApplicationController
   end
   
   def edit
-    @user = authenticate_user
-    unless @user.is_superuser || @user.can_manage_users || @user.id.to_s == params[:id]
+    user = authenticate_user
+    unless user.is_superuser || user.can_manage_users || user.id.to_s == params[:id]
       render :layout => true, :text => "Sorry, you don't have permission to access this section." and return false
     end
     
     @user = User.find(params[:id])
     
     if request.post?
-      @user.update_attributes(params[:user])
+      if user.is_superuser || user.can_manage_users
+        params[:user].each { |k,v| @user.send("#{k}=", v) }
+      elsif user.id.to_s == params[:id]
+        @user.first_name = params[:user][:first_name]
+        @user.last_name = params[:user][:last_name]
+        @user.email_address = params[:user][:email_address]
+        @user.password = params[:user][:password]
+        @user.password_confirmation = params[:user][:password_confirmation]
+      end
       
       if @user.save
         flash[:notice] = 'User updated successfully. Please note that the user must log out and log back in for permission changes to take effect.'

data/app/controllers/util_controller.rb

@@ -0,0 +1,45 @@
+class UtilController < ApplicationController # :nodoc:
+  skip_before_filter :check_ssl_requirement
+  
+  def calendar
+    @month = (params[:month] || Time.now.month).to_i
+    @year = (params[:year] || Time.now.year).to_i
+    first_of_month = Time.utc(@year, @month, 1)
+    last_of_month = first_of_month.end_of_month
+    
+    @min_time = params[:min_time].to_i
+    @max_time = params[:max_time].to_i
+    @calendar = params[:calendar_id] ? Calendar.find(params[:calendar_id]) : Calendar.find(:first)
+    @css_prefix = params[:css_prefix].to_s.gsub(/[^-\w]/, '')
+    @popout_direction = params[:popout_direction]
+    
+    events = @calendar.events.find(:all, :conditions => [ 'start_date >= ? and start_date < ?', first_of_month, last_of_month + 1.day ])
+    
+    @event_days = {}
+    events.each do |e|
+      @event_days[e.start_date.mday] = e
+    end
+    
+    render :update do |page|
+      page.replace_html 'event_calendar_month_year', :partial => 'calendar_month_year'
+      page.replace_html 'event_calendar_days', :partial => 'calendar_days'
+    end
+  end
+  
+  def date_picker
+    @month = params[:month].to_i
+    @year = params[:year].to_i
+    @min_time = params[:min_time].to_i
+    @max_time = params[:max_time].to_i
+    @exclude_days = (params[:exclude_days] || '').split(',').map { |d| d.to_i }
+    @object = params[:object]
+    @method_prefix = params[:method_prefix]
+    
+    render :partial => 'date_picker'
+  end
+  
+  def redirect_permanent
+    redirect_to params[:path], :status => 301
+  end
+  
+end