Merge pull request #1957 from ChurchCRM/2.6.0-1398-fix-group-images

closes #1938 and #1939
ChurchCRM · Feb 20, 2017 · 623a977 · 623a977
2 parents 4f0c461 + 4a6d632
commit 623a977
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/CartView.php b/src/CartView.php
@@ -337,7 +337,7 @@ function codename()
         }
 
         echo '<tr class="'.$sRowClass.'">';
-        echo '<td><img src="'.SystemURLs::getRootPath().'/api/persons/'.$per_ID.'/thumbnail" class="direct-chat-img"> &nbsp <a href="PersonView.php?PersonID='.$per_ID.'">'.FormatFullName($per_Title, $per_FirstName, $per_MiddleName, $per_LastName, $per_Suffix, 1).'</a></td>';
+        echo '<td><img data-name="'.$per_FirstName.' '.$per_LastName.'"data-src="'.SystemURLs::getRootPath().'/api/persons/'.$per_ID.'/thumbnail" class="direct-chat-img initials-image"> &nbsp <a href="PersonView.php?PersonID='.$per_ID.'">'.FormatFullName($per_Title, $per_FirstName, $per_MiddleName, $per_LastName, $per_Suffix, 1).'</a></td>';
         echo '<td align="center">'.$sValidAddy.'</td>';
         echo '<td align="center">'.$sValidEmail.'</td>';
         echo '<td><a href="CartView.php?RemoveFromPeopleCart='.

diff --git a/src/skin/js/GroupView.js b/src/skin/js/GroupView.js
@@ -250,7 +250,7 @@ function initDataTable() {
         title: 'Name',
         data: 'PersonId',
         render: function (data, type, full, meta) {
-          return '<img src="' + window.CRM.root + '/api/persons/' + full.PersonId + '/photo" class="direct-chat-img"> &nbsp <a href="PersonView.php?PersonID="' + full.PersonId + '"><a target="_top" href="PersonView.php?PersonID=' + full.PersonId + '">' + full.Person.FirstName + " " + full.Person.LastName + '</a>';
+          return '<img data-name="'+full.Person.FirstName + ' ' + full.Person.LastName + '" data-src="' + window.CRM.root + '/api/persons/' + full.PersonId + '/thumbnail" class="direct-chat-img initials-image"> &nbsp <a href="PersonView.php?PersonID="' + full.PersonId + '"><a target="_top" href="PersonView.php?PersonID=' + full.PersonId + '">' + full.Person.FirstName + " " + full.Person.LastName + '</a>';
         }
       },
       {
@@ -299,6 +299,7 @@ function initDataTable() {
     ],
     "fnDrawCallback": function (oSettings) {
       $("#iTotalMembers").text(oSettings.aoData.length);
+      $("#membersTable .initials-image").initial();
     },
     "createdRow": function (row, data, index) {
       $(row).addClass("groupRow");