Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-05 16:25:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.167.14

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-26 04:07:49 +02:00
parent bef398f778
commit 1a85195547
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -209,14 +209,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.13 (2017-03-26)"
#define Log_PLATFORM_VERSION "SWAD 16.167.14 (2017-03-26)"
#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.167.13:Mar 26, 2017 Code refactoring in uploading of photos. (? lines)
Version 16.167.14:Mar 26, 2017 Code refactoring in follow/unfollow. (217691 lines)
Version 16.167.13:Mar 26, 2017 Code refactoring in uploading of photos. (217686 lines)
Version 16.167.12:Mar 26, 2017 Code refactoring in edition of institutions. (217685 lines)
Version 16.167.11:Mar 26, 2017 Code refactoring in edition of degrees. (217686 lines)
Version 16.167.10:Mar 26, 2017 Code refactoring in edition of courses. (217688 lines)

19
swad_follow.c
View File

@ -1030,21 +1030,23 @@ void Fol_FollowUsr1 (void)
(Ntf_Status_t) (NotifyByEmail ? Ntf_STATUS_BIT_EMAIL :
0));
}
Gbl.AlertType = Lay_SUCCESS;
}
else
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
}
void Fol_FollowUsr2 (void)
{
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
if (!Gbl.Error)
if (Gbl.AlertType == Lay_SUCCESS)
/***** Show user's profile again *****/
Gbl.Error = !Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat);
Gbl.AlertType = Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat) ? Lay_SUCCESS :
Lay_WARNING;
if (Gbl.Error)
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
if (Gbl.AlertType == Lay_WARNING)
Lay_ShowAlert (Gbl.AlertType,Txt_User_not_found_or_you_do_not_have_permission_);
}
/*****************************************************************************/
@ -1069,9 +1071,10 @@ void Fol_UnfollowUsr1 (void)
Gbl.Usrs.Other.UsrDat.UsrCod);
DB_QueryREPLACE (Query,"can not unfollow user");
}
Gbl.AlertType = Lay_SUCCESS;
}
else
Gbl.Error = true;
Gbl.AlertType = Lay_WARNING;
}
void Fol_UnfollowUsr2 (void)
@ -1079,7 +1082,7 @@ void Fol_UnfollowUsr2 (void)
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
/***** Get user to be unfollowed *****/
if (!Gbl.Error)
if (Gbl.AlertType == Lay_SUCCESS)
{
/***** Show user's profile again *****/
if (!Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat)) // I can not view user's profile
@ -1089,7 +1092,7 @@ void Fol_UnfollowUsr2 (void)
Fol_ListFollowingUsr (&Gbl.Usrs.Me.UsrDat); // List users I follow
}
else
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
Lay_ShowAlert (Gbl.AlertType,Txt_User_not_found_or_you_do_not_have_permission_);
}
/*****************************************************************************/