Skip to content

Commit

Permalink
Fixed order of cache parts in various places
Browse files Browse the repository at this point in the history
  • Loading branch information
nerakdon committed Mar 12, 2016
1 parent eb2a7f6 commit c0968c9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/views/message_train/boxes/_list_item.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- cache ['boxes-list-item', @box_user, box], 'message-train' do
- cache ['message-train', 'boxes-list-item', @box_user, box] do
- if box.present?
%li{ html_options }
= link_to box.title, message_train.box_path(box.division)
Expand Down
2 changes: 1 addition & 1 deletion app/views/message_train/boxes/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- else
- add_title collective_name(@collective) + ' ' + @box.title
- marking_path = message_train.collective_box_path(@collective.path_part, @box.division)
- cache ['boxes-show', @box_user, @box], 'message-train' do
- cache ['message-train', 'boxes-show', @box_user, @box] do
= form_tag marking_path, method: :put, remote: true, id: 'box', data: { type: :json } do
- unless @conversations.empty?
#box-actions.box-actions
Expand Down
2 changes: 1 addition & 1 deletion app/views/message_train/collectives/_list_item.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- cache ['collectives-list-item', @box_user, box], 'message-train' do
- cache ['message-train', 'collectives-list-item', @box_user, box] do
- if box.present?
%li{ html_options }
= link_to box.title, message_train.collective_box_path(box.parent.path_part, box.division)
Expand Down
2 changes: 1 addition & 1 deletion app/views/message_train/collectives/_widget.html.haml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- cache ['collectives-widget', box_user, collective], 'message-train' do
- cache ['message-train', 'collectives-widget', box_user, collective] do
- unless collective.boxes_for_participant(box_user).empty?
.hidden-print
%h3= :collective_messages.l(collective: collective_name(collective))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- cache ['conversation-result', @box_user, conversation], 'message-train' do
- cache ['message-train', 'conversation-result', @box_user, conversation] do
%tr.message_train_conversation{ class: conversation_class(@box, conversation), id: 'message_train_conversation_' + conversation.id.to_s }
%td.col-xs-1= check_box_tag "objects[conversations][#{conversation.id.to_s}]", conversation.id
- if @collective.nil?
Expand Down
2 changes: 1 addition & 1 deletion app/views/message_train/conversations/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- add_title @conversation.subject
- add_subtitle :updated_at_time.l(time: @conversation.updated_at)
- cache ['conversations-show', @box_user, @conversation], 'message-train' do
- cache ['message-train', 'conversations-show', @box_user, @conversation] do
#box
#conversation-actions.conversation-actions.pull-right
.btn.btn-default.btn-lg= conversation_ignored_toggle(@conversation)
Expand Down

0 comments on commit c0968c9

Please sign in to comment.