Fixed and committed import from >=2.0 in r49390 and import from 1.8 in r49400, branch svn://svn.zabbix.com/branches/dev/ZBX-8791 (copy of branches/2.4).

(1) String changes?

No string changes.

kristsk RESOLVED.

iivs CLOSED.

<richlv> looks like at least two strings have been changed/removed - could you please check ?

$ svn diff -c 49889 | grep "Cannot \(add\|update\)"
-                                       throw new Exception(_('Cannot add image.'));
-                                       throw new Exception(_('Cannot update image.'));

iivs You're right. Translation strings removed:

• 'Cannot add image.'
• 'Cannot update image.'
  RESOLVED.

<richlv> thanks; (but also see the comment by jelisejev above) - this subissue is CLOSED

(2) Map importer does not convert older trigger expressions for example 2.0 -> 2.4 import .last(0) -> .last()

kristsk After discussing with sasha this is intended behavior as uniqueness of a trigger is determined by string values of description and expression. WONTFIX.

iivs Ok, understood.
CLOSED.

(3) "Images" checkboxes are missing from import form

kristsk RESOLVED in r49528.

iivs Only one checkbox is now displayed. Both update and create are required. "Images" checkboxes should be present there by default and not owerriden, and both should be disabled by default. I removed the code, it was not actually required. I was probably testing on non-superadmin to see if permissions work and forgot that simple admin users don't have those checkboxes. See r49686

kristsk CLOSED.

(6) Minor coding style fix. Please review r49689

kristsk CLOSED.

(7) Attached two XMLs, 1.8 import fails to import second time due to image update, 2.0 import fails without error description. Seems like it will not even go to processMaps(). Note all checkboxes for maps and images are checked.

kristsk Fixed problems with imported image create/update. RESOLVED in r49698.

iivs Looks much better now. But let's re-factor the code a bit, it looks very outdated and inconsistent 1.8 import and 2.0+ import.
For 1.8 import API image.get happens inside a loop with limit=1, we should select images all at once. And 2.0+ import uses SQL instead of API. Also let's use camelCase and rename $images_to_add to $imagesToCreate

REOPENED.

kristsk RESOLVED in r49748.

iivs CLOSED.

TESTED

Fixed and merged to:

• 2.4.2rc1 in r49889,
• 2.5.0 (trunk) in r49891.

(7) This needs to be noted in the 2.4 API changelog.

kristsk API changelog updated https://www.zabbix.com/documentation/2.4/manual/api/changes_2.2_-_2.4#configuration. RESOLVED.

jelisejev CLOSED.

Ivo, please have a look at (1).

Krists, please respond to the first comment.

kristsk Responded.