Skip to:

  1. Skip to Jira Navigation
  2. Skip to Side Navigation
  3. Skip to Main Content

last-merge-time doesn't correctly work for Site template merge

Description

SitesUtil.isLayoutModifiedSinceLastMerge compares LayoutSet's "last-merge-time" with current layout.modifiedDate.

Although LayoutLocalServiceVirtualLayoutsAdvice.mergeLayoutSetProtypeLayouts sets "last-merge-time" to the merged LayoutSet correctly (based on LayoutSetPrototype.modifiedDate), it doesn't correlate with LayoutPrototype and merged layout.modifiedDate.

Activity

Show:

Jorge FerrerFebruary 10, 2012 at 6:38 AM

Closed after the comment from Tomas (the reported) as a duplicate of .

Thanks Tomas!

TopolikFebruary 10, 2012 at 1:12 AM

Hi Jorge.

I've verified it and Ray has already fixed it in : https://github.com/liferay/liferay-portal/commit/e2761067374d53a4de70f9db972ef942d6994722#L0L523 It's checking now properly the time when it was merged, not the time when the layoutset had been modified.

You can close this ticket Thank you!

– tom

Jorge FerrerFebruary 9, 2012 at 8:44 AM

Hi Tomas,

I am trying to verify if this ticket is already fixed or not. Based on your description I can't think of a way to reproduce a problem using the UI. I have reviewed the existing code and it does make sense to me. It is checking if the current layout has had any modifications since the last merge. This is used to know to not propagate further changes from the site template.

Please, let me know what you think. If the problem still exists, can you provide me with some details to reproduce it?

Michael SaechangJanuary 30, 2012 at 11:29 AM

Updated ticket as per Drew's comment. Thank you for verifying.

Drew BlessingJanuary 27, 2012 at 4:40 AM

Thanks, Tomas. I will update the issue accordingly.

Duplicate

Details

Assignee

Reporter

Labels

Fix Priority

3

Components

Fix versions

Affects versions

Priority

Zendesk Support

Created January 17, 2012 at 7:01 AM
Updated June 24, 2023 at 3:42 PM
Resolved February 10, 2012 at 6:38 AM
Loading...