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

[1082] remove the equipment item index page #1198

Merged
merged 1 commit into from
Mar 30, 2015
Merged

Conversation

squidgetx
Copy link
Contributor

Resolves #1082

@orenyk
Copy link
Contributor

orenyk commented Mar 23, 2015

link in navbar?

@squidgetx
Copy link
Contributor Author

  • Remove equipment tab from the user navbar
  • Remove all other links to equipment_items_path, scoping to the model or request_back when appropriate

@squidgetx
Copy link
Contributor Author

Note that in removing the equipment items links I changed the 'equipment' link for checkout persons to link to the equipment models index and also adjusted the view permissions such that it gives them a little bit more useful information

@@ -4,5 +4,4 @@

<p>
<%= link_to "Show", @equipment_item %> |
<%= link_to "View All", equipment_items_path %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we replace this with a link to /equipment_model/:id/equipment_items?

@orenyk
Copy link
Contributor

orenyk commented Mar 30, 2015

Looks good, the only change I'd make is replacing the "View all" link on the bottom of the resource views with a link to the nested equipment item index for the item's equipment model if we have it. Otherwise feel free to squash / merge.

@squidgetx
Copy link
Contributor Author

yes

@@ -5,7 +5,7 @@
<%= f.input :serial %>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<%= f.button :submit, cancel: equipment_items_path %>
<%= f.button :submit, cancel: @equipment_item %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if we're in the new method?

@orenyk
Copy link
Contributor

orenyk commented Mar 30, 2015

SQUASH IT.

@orenyk
Copy link
Contributor

orenyk commented Mar 30, 2015

👢

remove links to equipment item path

make equipment model page more informative for staff

re-add links;

re-add index for sub pages

restore spec

remove cancel
@squidgetx squidgetx force-pushed the 1082_remove_ei_index_2 branch from 24275d5 to 1cf3e9f Compare March 30, 2015 01:34
squidgetx added a commit that referenced this pull request Mar 30, 2015
[1082] remove the equipment item index page
@squidgetx squidgetx merged commit 4fd09fc into master Mar 30, 2015
@orenyk orenyk deleted the 1082_remove_ei_index_2 branch April 22, 2015 13:16
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.

Loading EquipmentObjects#index is molasses
2 participants