Changeset [5e37bad4d71c228732381cf1ccffe92a9c855ba0] by Doug Youch
June 1st, 2010 @ 12:40 PM
Used has_options in user segemnt. Display error message from
parser if
filter is invalid.
Merge branch 'development' of git://github.com/cykod/Webiva into user-segment
Conflicts:
app/models/domain_model.rb
http://github.com/cykod/Webiva/commit/5e37bad4d71c228732381cf1ccffe...
Committed by Doug Youch
- M app/controllers/members_controller.rb
- M app/controllers/module_app_controller.rb
- M app/models/data_cache.rb
- M app/models/domain_model.rb
- M app/models/user_segment.rb
- M app/models/user_segment/field.rb
- M app/models/user_segment/field_type.rb
- M app/models/user_segment/filter.rb
- M app/models/user_segment/operation.rb
- M app/views/members/_targets_table.rhtml
- M app/views/members/_user_segments_table.html.erb
- M app/views/members/index.rhtml
- M lib/site_node_engine.rb
- M vendor/modules/blog/app/controllers/blog/page_controller.rb
- M vendor/modules/blog/app/controllers/blog/page_renderer.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป