Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

[1384] Add optional archival deactivation of equipment #1527

Merged
merged 1 commit into from
Apr 5, 2016

Conversation

orenyk
Copy link
Contributor

@orenyk orenyk commented Mar 11, 2016

Resolves #1384

  • add autodeactivate_on_archive parameter to AppConfig
  • move equipment item deactivation to a model method
  • tweak ReservationsController#archive method to implement auto-deactivation
  • add feature specs for reservation archiving
  • add model specs for EquipmentItem#deactivate
  • add controller specs for ReservationsController#archive with auto-deactivation
  • FeatureHelpers#app_setup now deletes any pre-existing AppConfigs

@orenyk orenyk force-pushed the 1384_autodeactive_equipment branch 2 times, most recently from 56fbf99 to dd84088 Compare March 11, 2016 16:56
@esoterik
Copy link
Collaborator

esoterik commented Apr 4, 2016

This might be out of scope, but it would be nice to add a checkbox to the archive prompt to deactivate the item as well as having the global option

@esoterik
Copy link
Collaborator

esoterik commented Apr 4, 2016

Otherwise, looks good!

@orenyk
Copy link
Contributor Author

orenyk commented Apr 5, 2016

Good point, I'd just have to rebuild that prompt with something like a jQuery UI dialog if we wanted anything more complex. I'm going to leave that to another issue (we can pull the default state of that checkbox from the global config).

@orenyk
Copy link
Contributor Author

orenyk commented Apr 5, 2016

Rebasing since it's out of date and merging following a green build.

Resolves #1384
- add autodeactivate_on_archive parameter to AppConfig
- move equipment item deactivation to a model method
- tweak ReservationsController#archive method to implement
  auto-deactivation
- add feature specs for reservation archiving
- add model specs for EquipmentItem#deactivate
- add controller specs for ReservationsController#archive with
  auto-deactivation
- FeatureHelpers#app_setup now deletes any pre-existing AppConfigs
@orenyk orenyk force-pushed the 1384_autodeactive_equipment branch from dd84088 to 12f517c Compare April 5, 2016 00:13
@orenyk
Copy link
Contributor Author

orenyk commented Apr 5, 2016

Weird intermittent failure, opened up a new issue (#1537).

@orenyk orenyk merged commit d984e86 into master Apr 5, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants