mirrors/notebook
3
0
Fork 0
mirror of https://github.com/indentlabs/notebook.git synced 2025-10-26 11:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix changelog field linking

Browse Source
This commit is contained in:
Andrew Brown 2018-11-23 18:51:09 -06:00
parent 298d0e1c83
commit f41372c7d4
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/content_controller.rb
View File

@ -87,6 +87,7 @@ class ContentController < ApplicationController
def edit
content_type_class = content_type_from_controller(self.class)
@content = content_type_class.find_by(id: params[:id])
@serialized_content = ContentSerializer.new(@content)
if @content.nil?
return redirect_to root_path,

6
app/views/content/display/_changelog.html.erb
View File

@ -2,7 +2,8 @@
attribute_change_events = content.raw_model.attribute_change_events
content_change_events = content.raw_model.content_change_events
changed_fields = AttributeField.where(id: attribute_change_events.select { |event| event.content_type == 'Attribute' }.map(&:content_id))
changed_attributes = Attribute.where(id: attribute_change_events.select { |event| event.content_type == 'Attribute' }.map(&:content_id))
changed_fields = AttributeField.where(id: changed_attributes.pluck(:attribute_field_id))
%>
<%# todo full-page changelog with all events %>
@ -28,7 +29,8 @@
<% attribute_change_events.reverse.each do |change_event| %>
<% next if change_event.user.nil? %>
<% change_event.changed_fields.each do |field_key, change| %>
<% related_field = changed_fields.detect { |field| field.id == change_event.content_id } %>
<% related_attribute = changed_attributes.detect { |attribute| attribute.id == change_event.content_id } %>
<% related_field = changed_fields.detect { |field| field.id == related_attribute.attribute_field_id } %>
<% key = related_field.label %>
<% next if change.first.blank? && change.second.blank? %>
<% next if %w(id created_at updated_at user user_id).include?(field_key) %>

2
app/views/content/display/_sidelinks.html.erb
View File

@ -12,7 +12,7 @@
<% if creating || editing %>
<li class="collection-header center">
<button class="btn waves-effect waves-<%= content.class_color %> <%= content.class_color %> mp-sidebar-save" type="submit" name="action" style="margin: 20px 0;">
<%= content.new_record? ? 'Create' : 'Save Changes' %>
<%= content.raw_model.new_record? ? 'Create' : 'Save Changes' %>
</button>
</li>
<% end %>

8
app/views/content/edit.html.erb
View File

@ -11,7 +11,13 @@
</div>
<div class="col s12 m3">
<%= render partial: 'content/display/sidelinks', locals: { editing: true, content: @content } %>
<%=
render partial: 'content/display/sidelinks',
locals: {
editing: true,
content: @serialized_content
}
%>
</div>
<% end %>
</div>