Changeset [1d443c32be2c2fdf88cf61adcaa6a64fa5c24a86] by Shawn Balestracci
Revision 1d443c32be2c2fdf88cf61adcaa6a64fa5c24a86,
committed by Shawn Balestracci
· October 24th, 2011 @ 08:45 AM
Merge branch '649_staff_assignments_manual' into wip
https://github.com/vegantech/sims/commit/1d443c32be2c2fdf88cf61adca...
14 changed files
-
A
app/views/district/users/_staff_assignment.erb -
A
app/views/district/users/_staff_assignments.erb -
M
app/controllers/district/users_controller.rb -
M
app/helpers/builder_helper.rb -
M
app/helpers/label_form_builder.rb -
M
app/models/district.rb -
M
app/models/staff_assignment.rb -
M
app/models/user.rb -
M
app/views/district/users/_label_form.html.erb -
M
features/district_admin/district_users_admin.feature -
M
features/step_definitions/district_builder_steps.rb -
M
public/stylesheets/common.css -
M
spec/controllers/district/users_controller_spec.rb -
M
spec/models/user_spec.rb