From e5f732f1e1199d2e1847260fd39a51f4ce979413 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 6 Mar 2018 06:36:48 +0100 Subject: [PATCH] User user order attributes based on object attribute manager. --- app/assets/javascripts/app/models/organization.coffee | 2 -- app/assets/javascripts/app/models/user.coffee | 4 ---- 2 files changed, 6 deletions(-) diff --git a/app/assets/javascripts/app/models/organization.coffee b/app/assets/javascripts/app/models/organization.coffee index b3dd7dbe4..7ce873f2d 100644 --- a/app/assets/javascripts/app/models/organization.coffee +++ b/app/assets/javascripts/app/models/organization.coffee @@ -5,8 +5,6 @@ class App.Organization extends App.Model @configure_attributes = [ { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false, info: true }, { name: 'shared', display: 'Shared organization', tag: 'boolean', note: 'Customers in the organization can view each other items.', type: 'boolean', default: true, null: false, info: false }, - { name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true, info: true }, - { name: 'active', display: 'Active', tag: 'active', default: true, info: false }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1, info: false }, { name: 'created_at', display: 'Created at', tag: 'datetime', readonly: 1, info: false }, { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1, info: false }, diff --git a/app/assets/javascripts/app/models/user.coffee b/app/assets/javascripts/app/models/user.coffee index a122cffa3..eacdeebb3 100644 --- a/app/assets/javascripts/app/models/user.coffee +++ b/app/assets/javascripts/app/models/user.coffee @@ -10,10 +10,6 @@ class App.User extends App.Model { name: 'lastname', display: 'Lastname', tag: 'input', type: 'text', limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true }, { name: 'email', display: 'Email', tag: 'input', type: 'email', limit: 100, null: false, signup: true, info: true, invite_agent: true, invite_customer: true }, { name: 'organization_id', display: 'Organization', tag: 'select', multiple: false, nulloption: true, null: true, relation: 'Organization', signup: false, info: true, invite_customer: true }, - { name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 50, null: true, autocomplete: 'new-password', signup: true, }, - { name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true, info: true, invite_customer: true }, - { name: 'role_ids', display: 'Permissions', tag: 'user_permission', null: false, invite_agent: true, invite_customer: true, item_class: 'checkbox' }, - { name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 }, { name: 'created_at', display: 'Created at', tag: 'datetime', readonly: 1 }, { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 },