All the resources are loaded to the Scheduler control when trying to create a new resource and assign this resource to the appointment

Hello There;
I would ike to filter my resource by current user in XAF. I have used the workaround discussed on B132403 bug report. It works fine apparently. However, when I try to create a new resource and assign this resource to my new appointment, all the resources are loaded to the Schedular control. the controller which I have used is below. Also, Instead of creating new MyResource class, I have added User Attribute to my Resource class and re-builded the BaseImpl project.
using System;
using System.ComponentModel;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using DevExpress.ExpressApp;
using DevExpress.ExpressApp.Actions;
using DevExpress.Persistent.Base;
using DevExpress.Persistent.Base.General;
using DevExpress.ExpressApp.Scheduler.Win;
using DevExpress.XtraScheduler;
using DevExpress.Xpo;
using DevExpress.Data.Filtering;
namespace XPOCRM.Module.Win.ViewControllers
{
    public partial class SchedulerFilterController : ViewController
    {
        public SchedulerFilterController()
        {
            TargetObjectType = typeof(IEvent);
            TargetViewType = ViewType.ListView;
        }
        protected override void OnActivated()
        {
            base.OnActivated();
            SchedulerListEditor editor = ((ListView)View).Editor as SchedulerListEditor;
            editor.ResourceDataSourceCreating += new System.EventHandler<DevExpress.ExpressApp.Scheduler.ResourceDataSourceCreatingEventArgs>(editor_ResourceDataSourceCreating);
            View.ControlsCreated += new System.EventHandler(this.View_ControlsCreated);
        }
        protected override void OnDeactivating()
        {
            base.OnDeactivating();
            View.ControlsCreated -= new System.EventHandler(this.View_ControlsCreated);
            SchedulerListEditor editor = ((ListView)View).Editor as SchedulerListEditor;
            editor.ResourceDataSourceCreating -= new System.EventHandler<DevExpress.ExpressApp.Scheduler.ResourceDataSourceCreatingEventArgs>(editor_ResourceDataSourceCreating);
        }
        private void View_ControlsCreated(object sender, System.EventArgs e)
        {
            DoFilter();
        }
        void editor_ResourceDataSourceCreating(object sender, DevExpress.ExpressApp.Scheduler.ResourceDataSourceCreatingEventArgs e)
        {
            SchedulerListEditor editor = (SchedulerListEditor)sender;
            SchedulerControl scheduler = (SchedulerControl)editor.Scheduler;
            scheduler.BeginUpdate();
            try
            {
                XPCollection<DevExpress.Persistent.BaseImpl.Resource> resources = new XPCollection<DevExpress.Persistent.BaseImpl.Resource>(ObjectSpace.Session);
                resources.Criteria = CriteriaOperator.Parse("User.Oid=?", SecuritySystem.CurrentUserId);
                e.DataSource = resources;
                e.Handled = true;
            }
            finally
            {
                scheduler.EndUpdate();
            }
        }
        private void DoFilter()
        {
            if (((ListView)View).Editor is SchedulerListEditor)
            {
                SchedulerListEditor editor = (SchedulerListEditor)((ListView)View).Editor;
                SchedulerControl scheduler = (SchedulerControl)editor.Scheduler;
                scheduler.BeginUpdate();
                try
                {
                    XPCollection resources = editor.ResourcesDataSource as XPCollection;
                    if (resources != null)
                    {
                        resources.Criteria = CriteriaOperator.Parse("User.Oid=?", SecuritySystem.CurrentUserId);
                    }
                }
                finally
                {
                    scheduler.EndUpdate();
                }
            }
        }
    }
}
What am I doing wrong in this case?
Best Regards
Mesut KOSUCU
Alanis Morissette - "We'll love you just the way you are if you're perfect."