Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added created_at and updated_at to overview order by attributes.

Browse source
This commit is contained in:
Martin Edenhofer 2016-03-09 08:17:23 +01:00
parent a17a1d3d41
commit dbb4807149
4 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/app/models/organization.coffee
View file

@ -3,12 +3,14 @@ class App.Organization extends App.Model
@extend Spine.Model.Ajax @extend Spine.Model.Ajax
@url: @apiPath + '/organizations' @url: @apiPath + '/organizations'
@configure_attributes = [ @configure_attributes = [
{ name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false, info: true }, { 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: '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: '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: 'active', display: 'Active', tag: 'active', default: true, info: false },
{ name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1, info: false }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1, info: false },
{ name: 'created_at', display: 'Created', tag: 'datetime', 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 },
{ name: 'updated_at', display: 'Updated at', tag: 'datetime', readonly: 1, info: false },
] ]
@configure_overview = [ @configure_overview = [
'name', 'name',

23
app/assets/javascripts/app/models/overview.coffee
View file

@ -46,21 +46,17 @@ class App.Overview extends App.Model
value: 'owner' value: 'owner'
name: 'Owner' name: 'Owner'
}, },
{
value: 'created_at'
name: 'Age'
},
{ {
value: 'last_contact' value: 'last_contact'
name: 'Last contact' name: 'Last contact'
}, },
{ {
value: 'last_contact_agent' value: 'last_contact_agent'
name: 'Last contact (agent)' name: 'Last contact (Agent)'
}, },
{ {
value: 'last_contact_customer' value: 'last_contact_customer'
name: 'Last contact (customer)' name: 'Last contact (Customer)'
}, },
{ {
value: 'first_response' value: 'first_response'
@ -74,6 +70,14 @@ class App.Overview extends App.Model
value: 'article_count' value: 'article_count'
name: 'Article Count' name: 'Article Count'
}, },
{
value: 'updated_at'
name: 'Updated at'
},
{
value: 'created_at'
name: 'Created at'
},
] ]
class: 'medium' class: 'medium'
}, },
@ -93,13 +97,14 @@ class App.Overview extends App.Model
priority: 'Priority' priority: 'Priority'
group: 'Group' group: 'Group'
owner: 'Owner' owner: 'Owner'
created_at: 'Age'
last_contact: 'Last contact' last_contact: 'Last contact'
last_contact_agent: 'Last contact (agent)' last_contact_agent: 'Last contact (Agent)'
last_contact_customer: 'Last contact (customer)' last_contact_customer: 'Last contact (Customer)'
first_response: 'First Response' first_response: 'First Response'
close_time: 'Close time' close_time: 'Close time'
article_count: 'Article Count' article_count: 'Article Count'
updated_at: 'Updated at'
created_at: 'Created at'
class: 'span4' class: 'span4'
}, },
{ {

6
app/assets/javascripts/app/models/user.coffee
View file

@ -15,8 +15,10 @@ class App.User extends App.Model
{ name: 'role_ids', display: 'Roles', tag: 'checkbox', multiple: true, null: false, relation: 'Role' }, { name: 'role_ids', display: 'Roles', tag: 'checkbox', multiple: true, null: false, relation: 'Role' },
{ name: 'group_ids', display: 'Groups', tag: 'checkbox', multiple: true, null: true, relation: 'Group', invite_agent: true, invite_customer: true }, { name: 'group_ids', display: 'Groups', tag: 'checkbox', multiple: true, null: true, relation: 'Group', invite_agent: true, invite_customer: true },
{ name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'active', display: 'Active', tag: 'active', default: true },
{ name: 'created_at', display: 'Created', tag: 'datetime', readonly: 1 }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 },
{ name: 'updated_at', display: 'Updated', tag: 'datetime', readonly: 1 }, { name: 'created_at', display: 'Created at', tag: 'datetime', readonly: 1 },
{ name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 },
{ name: 'updated_at', display: 'Updated at', tag: 'datetime', readonly: 1 },
] ]
@configure_overview = [ @configure_overview = [
# 'login', 'firstname', 'lastname', 'email', 'updated_at', # 'login', 'firstname', 'lastname', 'email', 'updated_at',

4
app/assets/javascripts/app/views/generic/ticket_selector.jst.eco
View file

@ -21,10 +21,10 @@
<div class="controls js-value horizontal"></div> <div class="controls js-value horizontal"></div>
</div> </div>
<div class="filter-controls"> <div class="filter-controls">
<div class="filter-control filter-control-remove js-remove" title="<%- @T('Remove') %>"> <div class="filter-control filter-control-remove js-remove" title="<%- @Ti('Remove') %>">
<%- @Icon('minus-small') %> <%- @Icon('minus-small') %>
</div> </div>
<div class="filter-control filter-control-add js-add" title="<%- @T('Add') %>"> <div class="filter-control filter-control-add js-add" title="<%- @Ti('Add') %>">
<%- @Icon('plus-small') %> <%- @Icon('plus-small') %>
</div> </div>
</div> </div>