Chore: Minor bugfixes and housekeeping tasks (#896)

This commit is contained in:
Sojan Jose
2020-06-02 23:50:39 +05:30
committed by GitHub
parent 93d8a25877
commit dafabac796
21 changed files with 271 additions and 51 deletions

View File

@@ -4,10 +4,10 @@ json.uid resource.uid
json.name resource.name
json.nickname resource.nickname
json.email resource.email
json.account_id resource.active_account_user.account_id
json.account_id resource.active_account_user&.account_id
json.pubsub_token resource.pubsub_token
json.role resource.active_account_user.role
json.inviter_id resource.active_account_user.inviter_id
json.role resource.active_account_user&.role
json.inviter_id resource.active_account_user&.inviter_id
json.confirmed resource.confirmed?
json.avatar_url resource.avatar_url
json.access_token resource.access_token.token

View File

@@ -72,7 +72,6 @@ as well as a link to its edit page.
<% account_user_page.attributes.each do |attribute| -%>
<% if attribute.name == "account" %>
<%= f.hidden_field('account_id', value: page.resource.id) %>
<%= f.hidden_field('redirect_to', value: 'user') %>
<% else %>
<div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
<%= render_field attribute, f: f %>

View File

@@ -30,7 +30,7 @@ as defined by the routes in the `admin/` namespace
<%= link_to "Dashboard", super_admin_root_url %>
</li>
<% Administrate::Namespace.new(namespace).resources.each do |resource| %>
<% next if ["account_users", "dashboard", "devise/sessions"].include? resource.resource %>
<% next if ["account_users", "agent_bots","dashboard", "devise/sessions"].include? resource.resource %>
<li class="navigation__link navigation__link--<%= nav_link_state(resource) %>">
<i class="<%= sidebar_icons[resource.resource.to_sym] %>"></i>
<%= link_to(

View File

@@ -72,7 +72,6 @@ as well as a link to its edit page.
<% account_user_page.attributes.each do |attribute| -%>
<% if attribute.name == "user" %>
<%= f.hidden_field('user_id', value: page.resource.id) %>
<%= f.hidden_field('redirect_to', value: 'user') %>
<% else %>
<div class="field-unit field-unit--<%= attribute.html_class %> field-unit--<%= requireness(attribute) %>">
<%= render_field attribute, f: f %>

View File

@@ -5,7 +5,7 @@
window.chatwootSettings = {
hideMessageBubble: false,
position: 'left',
locale: 'fr',
locale: 'en',
};
(function(d,t) {