From 73b66864b56f5d714511c00d414112747a273a94 Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Thu, 13 Apr 2017 14:35:12 +0530
Subject: [PATCH] Fixes #493, - vt7 change organization associated to
opportunity from summary view
#499 - vt7: Innapropriate content on Login screen
---
layouts/v7/modules/Users/Login.tpl | 15 ++++++++-------
layouts/v7/modules/Vtiger/resources/Detail.js | 2 +-
layouts/v7/modules/Vtiger/resources/Vtiger.js | 1 +
modules/Users/views/Login.php | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/layouts/v7/modules/Users/Login.tpl b/layouts/v7/modules/Users/Login.tpl
index 22cef5029..10005f038 100644
--- a/layouts/v7/modules/Users/Login.tpl
+++ b/layouts/v7/modules/Users/Login.tpl
@@ -258,16 +258,17 @@
<div class="row">
{if $BLOCK_DATA.image}
<div class="col-lg-3" style="min-height: 100px;"><img src="{$BLOCK_DATA.image}" style="width: 100%;height: 100%;"/></div>
- <div class="col-lg-9" title="{$BLOCK_DATA.summary}">
- {else}
- <div class="col-lg-12" title="{$BLOCK_DATA.summary}">
- {/if}
+ <div class="col-lg-9">
+ {else}
+ <div class="col-lg-12">
+ {/if}
+ <div title="{$BLOCK_DATA.summary}">
<h4>{$BLOCK_DATA.displayTitle}</h4>
{$BLOCK_DATA.displaySummary}<br><br>
- <span class="blockLink">
- <a href="{$BLOCK_DATA.url}" target="_blank">{$BLOCK_DATA.urlalt}</a>
- </span>
</div>
+ <span class="blockLink">
+ <a href="{$BLOCK_DATA.url}" target="_blank">{$BLOCK_DATA.urlalt}</a>
+ </span>
</div>
</div>
{/foreach}
diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js
index 50e9ff09f..e316751c1 100644
--- a/layouts/v7/modules/Vtiger/resources/Detail.js
+++ b/layouts/v7/modules/Vtiger/resources/Detail.js
@@ -1261,7 +1261,7 @@ Vtiger.Class("Vtiger_Detail_Js",{
}
fieldElement = fieldElement.filter('[type="checkbox"]');
} else if(fieldType == 'reference'){
- ajaxEditNewValue = fieldElement.attr('value');
+ ajaxEditNewValue = fieldElement.data('value');
}
// prev Value should be taken based on field Type
diff --git a/layouts/v7/modules/Vtiger/resources/Vtiger.js b/layouts/v7/modules/Vtiger/resources/Vtiger.js
index cde4a443e..14c8deee0 100644
--- a/layouts/v7/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js
@@ -829,6 +829,7 @@ Vtiger.Class('Vtiger_Index_Js', {
var fieldName = sourceField.attr("name");
parent.find('input[name="'+fieldName+'"]').val(selectedItemData.id);
element.attr("value",selectedItemData.id);
+ element.data("value",selectedItemData.id);
parent.find('.clearReferenceSelection').removeClass('hide');
parent.find('.referencefield-wrapper').addClass('selected');
element.attr("disabled","disabled");
diff --git a/modules/Users/views/Login.php b/modules/Users/views/Login.php
index 3b2504b8a..cc50daae1 100644
--- a/modules/Users/views/Login.php
+++ b/modules/Users/views/Login.php
@@ -43,7 +43,7 @@ class Users_Login_View extends Vtiger_View_Controller {
$oldTextLength = vglobal('listview_max_textlength');
foreach ($jsonData as $blockData) {
if ($blockData['type'] === 'feature') {
- $blockData['heading'] = "What's new in Vtiger";
+ $blockData['heading'] = "What's new in Vtiger Cloud";
} else if ($blockData['type'] === 'news') {
$blockData['heading'] = "Latest News";
$blockData['image'] = '';
--
GitLab