diff --git a/app/views/admin/_article_editor.html.erb b/app/views/admin/_article_editor.html.erb
index 0c736e2f7..8e78b368d 100644
--- a/app/views/admin/_article_editor.html.erb
+++ b/app/views/admin/_article_editor.html.erb
@@ -43,12 +43,12 @@
'link-tooltip': true
}
});
-// quill.addModule('toolbar', {
-// container: '#toolbar'
-// });
+ <% if @post.nil? %>
quill.setHTML('<%= @doc.body.html_safe if @doc.body? %>');
+ <% else %>
quill.setHTML('<%= @post.body.html_safe unless @post.nil? %>');
-
+ <% end %>
+
quill.on('text-change', function(delta, source) {
//console.log(quill.getHTML());
$('#doc_body').val(quill.getHTML());
diff --git a/app/views/admin/tickets.html.erb b/app/views/admin/tickets.html.erb
index 6c69f5011..82b007b3c 100644
--- a/app/views/admin/tickets.html.erb
+++ b/app/views/admin/tickets.html.erb
@@ -1,7 +1,7 @@
<%#= render 'admin/ticket_stats' %>
- <%= t(:discussions, default: "Discussions: ") %> <%= render 'admin/ticket_nav_dropdown' %> <%= link_to t(:open_new_discussion, default: "Open Discussion"), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %>
+ <%= t(:discussions, default: "Discussions") %>: <%= status_label(@status) if @status %> <%= render 'admin/ticket_nav_dropdown' %> <%= link_to t(:open_new_discussion, default: "Open Discussion"), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %>
diff --git a/app/views/home/_team_member.html.erb b/app/views/home/_team_member.html.erb
index 2281aa4c7..9d62227fb 100644
--- a/app/views/home/_team_member.html.erb
+++ b/app/views/home/_team_member.html.erb
@@ -9,8 +9,8 @@
<%= team_member.name.titleize %>
- <%= team_member.company.titleize unless team_member.company.nil? %>
- <%= team_member.title.titleize unless team_member.title.nil? %>
+ <%#= team_member.company.titleize unless team_member.company.nil? %>
+ <%#= team_member.title.titleize unless team_member.title.nil? %>