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

Fixes 3594 - Allow position to determine an attributes position entirely.

Browse source
This commit is contained in:
Bola Ahmed Buari 2021-10-26 14:33:06 +02:00 committed by Martin Edenhofer
parent f4116fb181
commit 913dcdd2ab
6 changed files with 165 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/object_manager.coffee
View file

@ -247,8 +247,6 @@ class Edit extends App.ControllerGenericEdit
#if attribute.name is 'data_type'
# attribute.disabled = true
console.log('configure_attributes', configure_attributes)
@controller = new App.ControllerForm(
model:
configure_attributes: configure_attributes

11
app/assets/javascripts/app/models/_application_model.coffee
View file

@ -916,20 +916,25 @@ set new attributes of model (remove already available attributes)
# use jquery instead of ._clone() because we need a deep copy of the obj
@org_configure_attributes = $.extend(true, [], @configure_attributes)
configure_attributes = $.extend(true, [], @configure_attributes)
allAttributes = []
for attribute in attributes
@attributes.push attribute.name
found = false
for attribute_model, index in @configure_attributes
for attribute_model, index in configure_attributes
continue if attribute_model.name != attribute.name
@configure_attributes[index] = _.extend(attribute_model, attribute)
allAttributes.push $.extend(true, attribute_model, attribute)
configure_attributes.splice(index, 1) # remove found attribute
found = true
break
if !found
@configure_attributes.push attribute
allAttributes.push $.extend(true, {}, attribute)
@configure_attributes = $.extend(true, [], allAttributes.concat(configure_attributes))
@resetAttributes: ->
return if _.isEmpty(@org_configure_attributes)

94
db/migrate/20211026000001_object_manager_ticket_object_update.rb Normal file
View file

@ -0,0 +1,94 @@
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
class ObjectManagerTicketObjectUpdate < ActiveRecord::Migration[4.2]
def up
# return if it's a new setup
return if !Setting.exists?(name: 'system_init_done')
UserInfo.current_user_id = 1
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
name: 'number',
display: '#',
data_type: 'input',
data_option: {
type: 'text',
readonly: 1,
null: true,
maxlength: 60,
width: '68px',
},
editable: false,
active: true,
screens: {
create_top: {},
edit: {},
},
to_create: false,
to_migrate: false,
to_delete: false,
position: 5,
)
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
name: 'title',
display: 'Title',
data_type: 'input',
data_option: {
type: 'text',
maxlength: 200,
null: false,
translate: false,
},
editable: false,
active: true,
screens: {
create_top: {
'-all-' => {
null: false,
},
},
edit: {},
},
to_create: false,
to_migrate: false,
to_delete: false,
position: 8,
)
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
name: 'organization_id',
display: 'Organization',
data_type: 'autocompletion_ajax',
data_option: {
relation: 'Organization',
autocapitalize: false,
multiple: false,
null: true,
translate: false,
permission: ['ticket.agent'],
readonly: 1,
},
editable: false,
active: true,
screens: {
create_top: {
'-all-' => {
null: false,
},
},
edit: {},
},
to_create: false,
to_migrate: false,
to_delete: false,
position: 12,
)
end
end

59
db/seeds/object_manager_attributes.rb
View file

@ -1,5 +1,30 @@
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
name: 'number',
display: '#',
data_type: 'input',
data_option: {
type: 'text',
readonly: 1,
null: true,
maxlength: 60,
width: '68px',
},
editable: false,
active: true,
screens: {
create_top: {},
edit: {},
},
to_create: false,
to_migrate: false,
to_delete: false,
position: 5,
)
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
@ -25,7 +50,7 @@ ObjectManager::Attribute.add(
to_create: false,
to_migrate: false,
to_delete: false,
position: 15,
position: 8,
)
ObjectManager::Attribute.add(
@ -61,6 +86,38 @@ ObjectManager::Attribute.add(
to_delete: false,
position: 10,
)
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',
name: 'organization_id',
display: 'Organization',
data_type: 'autocompletion_ajax',
data_option: {
relation: 'Organization',
autocapitalize: false,
multiple: false,
null: true,
translate: false,
permission: ['ticket.agent'],
readonly: 1,
},
editable: false,
active: true,
screens: {
create_top: {
'-all-' => {
null: false,
},
},
edit: {},
},
to_create: false,
to_migrate: false,
to_delete: false,
position: 12,
)
ObjectManager::Attribute.add(
force: true,
object: 'Ticket',

5
public/assets/tests/model.js
View file

@ -227,8 +227,9 @@ test("updateAttributes will change existing attributes and add new ones", functi
var attributesAfterUpdate = _.clone(App.Ticket.configure_attributes);
equal(attributesAfterUpdate.length, attributesBefore.length + 1, 'new attributes list contains 1 more elements')
equal(attributesAfterUpdate[attributesAfterUpdate.length - 1]['name'], 'new_attribute_1010101', 'new attributes list contains the new element')
equal(attributesAfterUpdate[0]['new_option_1239393'], 1, 'first element of the new attributes got updated with the new option')
equal(attributesAfterUpdate[0]['new_option_1239393'], 1, 'first element of the new attributes is number')
equal(attributesAfterUpdate[0]['name'], 'number', 'first element of the new attributes got updated with the new option')
equal(attributesAfterUpdate[1]['name'], 'new_attribute_1010101', 'new attributes list contains the new element')
App.Ticket.resetAttributes();
var attributesAfterReset = _.clone(App.Ticket.configure_attributes);

4
spec/models/object_manager/attribute_spec.rb
View file

@ -76,7 +76,7 @@ RSpec.describe ObjectManager::Attribute, type: :model do
end
end
%w[title tags].each do |not_editable_attribute|
%w[title tags number].each do |not_editable_attribute|
it "rejects '#{not_editable_attribute}' which is used" do
expect do
described_class.add attributes_for :object_manager_attribute_text, name: not_editable_attribute
@ -84,7 +84,7 @@ RSpec.describe ObjectManager::Attribute, type: :model do
end
end
%w[priority state note number].each do |existing_attribute|
%w[priority state note].each do |existing_attribute|
it "rejects '#{existing_attribute}' which is used" do
expect do
described_class.add attributes_for :object_manager_attribute_text, name: existing_attribute