From 67927f151a7ffa002dc4685f5ac8de5979c5056b Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Mon, 29 Jul 2013 16:02:24 +0530 Subject: [PATCH] CRM-12915, fixed dailog output for empty response ---------------------------------------- * CRM-12915: Improve layout of revision-history for multi-row CustomGroups http://issues.civicrm.org/jira/browse/CRM-12915 --- templates/CRM/common/logButton.tpl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/CRM/common/logButton.tpl b/templates/CRM/common/logButton.tpl index 9b9eea084a..58362654b3 100644 --- a/templates/CRM/common/logButton.tpl +++ b/templates/CRM/common/logButton.tpl @@ -36,7 +36,7 @@ Note: This file is used by CivHR *} -Revisions +View Revisions
@@ -49,20 +49,20 @@ cj(document).on("click", ".{/literal}{$snippet.css_class}{literal}", function() title: "{/literal}{ts}Revisions{/ts}{literal}", modal: true, width: "680px", - height: "380", bgiframe: true, overlay: { opacity: 0.5, background: "black" }, open:function() { - var url = CRM.url("civicrm/report/instance/{/literal}{$snippet.instance_id}{literal}", { - reset:1, - snippet:4, - section:2, - altered_contact_id_op:"eq", - altered_contact_id_value:"{/literal}{$snippet.contact_id}{literal}", - log_type_table_op:"has", - log_type_table_value:"{/literal}{$snippet.table_name}{literal}" + var ajaxurl = {/literal}'{crmURL p="civicrm/report/instance/`$snippet.instance_id`" h=0 }'{literal}; + cj.ajax({ + data: "reset=1&snippet=4§ion=2&altered_contact_id_op=eq&altered_contact_id_value={/literal}{$snippet.contact_id}{literal}&log_type_table_op=has&log_type_table_value={/literal}{$snippet.table_name}{literal}", + url: ajaxurl, + success: function (data) { + cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content").html(data); + if (!cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content .report-layout").length) { + cj(".dialog-{/literal}{$snippet.css_class}{literal} .revision-content").html("Sorry, couldn't find any revisions."); + } + } }); - cj(".revision-content", this).load(url); }, buttons: { "Done": function() { -- 2.25.1