Skip to content
This repository was archived by the owner on Oct 25, 2023. It is now read-only.

Commit 8f34169

Browse files
committed
Fixed add contact from attachment
Closes #492
1 parent 4a3463e commit 8f34169

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

app/js/controllers.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,6 +1811,11 @@ angular.module('myApp.controllers', ['myApp.i18n'])
18111811
MtpApiManager.invokeApi('users.getFullUser', {
18121812
id: AppUsersManager.getUserInput($scope.userID)
18131813
}).then(function (userFullResult) {
1814+
if ($scope.override && !userFullResult.user.phone) {
1815+
userFullResult.user.phone = $scope.override.phone_number;
1816+
userFullResult.user.first_name = $scope.override.first_name;
1817+
userFullResult.user.last_name = $scope.override.last_name;
1818+
}
18141819
AppUsersManager.saveApiUser(userFullResult.user);
18151820
AppPhotosManager.savePhoto(userFullResult.profile_photo);
18161821
if (userFullResult.profile_photo._ != 'photoEmpty') {

app/js/directives.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,7 @@ angular.module('myApp.directives', ['myApp.filters'])
17671767

17681768
if (element[0].tagName == 'A') {
17691769
element.on('click', function () {
1770-
$rootScope.openUser(userID);
1770+
$rootScope.openUser(userID, attrs.userOverride && $scope.$eval(attrs.userOverride));
17711771
});
17721772
}
17731773
if (attrs.color && $scope.$eval(attrs.color)) {
@@ -1840,7 +1840,7 @@ angular.module('myApp.directives', ['myApp.filters'])
18401840

18411841
if (element[0].tagName == 'A') {
18421842
element.on('click', function (e) {
1843-
$rootScope.openUser($scope.userID);
1843+
$rootScope.openUser($scope.userID, attrs.userOverride && $scope.$eval(attrs.userOverride));
18441844
});
18451845
}
18461846

app/js/services.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,10 @@ angular.module('myApp.services', ['myApp.i18n'])
184184
return user;
185185
}
186186

187-
function openUser (userID, accessHash) {
187+
function openUser (userID, override) {
188188
var scope = $rootScope.$new();
189189
scope.userID = userID;
190+
scope.override = override || {};
190191

191192
var modalInstance = $modal.open({
192193
templateUrl: templateUrl('user_modal'),

app/partials/desktop/message_attach_contact.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
2-
<a class="im_message_contact_photo pull-left" my-user-photolink="historyMessage.media.user_id" img-class="im_message_contact_photo"></a>
2+
<a class="im_message_contact_photo pull-left" my-user-photolink="historyMessage.media.user_id" img-class="im_message_contact_photo" user-override="historyMessage.media"></a>
33
<div class="im_message_contact_name" ng-switch="historyMessage.media.user_id > 0">
4-
<a ng-switch-when="true" my-user-link="historyMessage.media.user_id"></a>
4+
<a ng-switch-when="true" my-user-link="historyMessage.media.user_id" user-override="historyMessage.media"></a>
55
<span ng-switch-default ng-bind-html="::historyMessage.media.rFullName"></span>
66
</div>
77
<div class="im_message_contact_phone" ng-bind="::historyMessage.media.phone_number | phoneNumber"></div>

app/partials/mobile/message_attach_contact.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
2-
<a class="im_message_contact_photo pull-left" my-user-photolink="historyMessage.media.user_id" img-class="im_message_contact_photo"></a>
2+
<a class="im_message_contact_photo pull-left" my-user-photolink="historyMessage.media.user_id" img-class="im_message_contact_photo" user-override="historyMessage.media"></a>
33
<div class="im_message_contact_name" ng-switch="historyMessage.media.user_id > 0">
4-
<a ng-switch-when="true" my-user-link="historyMessage.media.user_id"></a>
4+
<a ng-switch-when="true" my-user-link="historyMessage.media.user_id" user-override="historyMessage.media"></a>
55
<span ng-switch-default ng-bind-html="::historyMessage.media.rFullName"></span>
66
</div>
77
<div class="im_message_contact_phone" ng-bind="::historyMessage.media.phone_number | phoneNumber"></div>

0 commit comments

Comments
 (0)