Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.114.4

This commit is contained in:
Antonio Cañas Vargas 2016-01-17 02:49:39 +01:00
parent 6236a8fa8f
commit c2c6088807
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -2334,7 +2334,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" },
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActRcvSocComUsr */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentGbl ,NULL},
/* ActRcvSocComGbl */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialNoteGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteGbl ,NULL},

4
swad_changelog.h
View File

@ -124,13 +124,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.114.2 (2016-01-17)"
#define Log_PLATFORM_VERSION "SWAD 15.114.4 (2016-01-17)"
#define CSS_FILE "swad15.113.8.css"
#define JS_FILE "swad15.113.8.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 15.114.4: Jan 17, 2016 Change related to button to remove a social post. (? lines)
Version 15.114.3: Jan 17, 2016 Fixed bug when getting timeline. (192820 lines)
Version 15.114.2: Jan 17, 2016 Fixed bug when getting timeline. (192811 lines)
Version 15.114.1: Jan 17, 2016 Optimized queries to get timeline. (192790 lines)
Version 15.114: Jan 17, 2016 Optimized queries to get timeline. (192817 lines)

14
swad_layout.c
View File

@ -614,8 +614,16 @@ static void Lay_WriteScriptInit (void)
// Refresh timeline via AJAX
fprintf (Gbl.F.Out," setTimeout(\"refreshLastClicks()\",%lu);\n",
Cfg_TIME_TO_REFRESH_LAST_CLICKS);
else if (Act_Actions[Gbl.CurrentAct].SuperAction == ActSeeSocTmlGbl)
// In all the actions children of ActSeeSocTmlGbl ==> refresh timeline via AJAX
else if (Gbl.CurrentAct == ActSeeSocTmlGbl ||
Gbl.CurrentAct == ActRcvSocPstGbl ||
Gbl.CurrentAct == ActRcvSocComGbl ||
Gbl.CurrentAct == ActShaSocNotGbl ||
Gbl.CurrentAct == ActUnsSocPubGbl ||
Gbl.CurrentAct == ActReqRemSocPubGbl ||
Gbl.CurrentAct == ActRemSocPubGbl ||
Gbl.CurrentAct == ActReqRemSocComGbl ||
Gbl.CurrentAct == ActRemSocComGbl)
// Refresh timeline via AJAX
fprintf (Gbl.F.Out," setTimeout(\"refreshNewTimeline()\",%lu);\n",
Cfg_TIME_TO_REFRESH_SOCIAL_TIMELINE);
@ -643,7 +651,7 @@ static void Lay_WriteScriptParamsAJAX (void)
/***** Parameters related with refreshing of social timeline *****/
if (Gbl.CurrentAct == ActSeeSocTmlGbl ||
Gbl.CurrentAct == ActRcvSocPstGbl ||
Gbl.CurrentAct == ActRcvSocComUsr ||
Gbl.CurrentAct == ActRcvSocComGbl ||
Gbl.CurrentAct == ActShaSocNotGbl ||
Gbl.CurrentAct == ActUnsSocPubGbl ||
Gbl.CurrentAct == ActReqRemSocPubGbl ||

6
swad_social.c
View File

@ -497,10 +497,10 @@ static void Soc_BuildQueryToGetTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl
switch (WhatToGetFromTimeline)
{
case Soc_GET_ONLY_NEW_PUBS:
case Soc_GET_RECENT_TIMELINE:
strcpy (SubQueryAlreadyExists," AND NotCod NOT IN"
" (SELECT NotCod FROM not_codes)");
break;
case Soc_GET_RECENT_TIMELINE:
case Soc_GET_ONLY_OLD_PUBS:
strcpy (SubQueryAlreadyExists," AND NotCod NOT IN"
" (SELECT NotCod FROM current_timeline)");
@ -524,10 +524,10 @@ static void Soc_BuildQueryToGetTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl
switch (WhatToGetFromTimeline)
{
case Soc_GET_ONLY_NEW_PUBS:
case Soc_GET_RECENT_TIMELINE:
strcpy (SubQueryAlreadyExists," AND social_pubs.NotCod NOT IN"
" (SELECT NotCod FROM not_codes)");
break;
case Soc_GET_RECENT_TIMELINE:
case Soc_GET_ONLY_OLD_PUBS:
strcpy (SubQueryAlreadyExists," AND social_pubs.NotCod NOT IN"
" (SELECT NotCod FROM current_timeline)");
@ -1168,7 +1168,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
Soc_ShowUsrsWhoHaveSharedSocialNote (SocNot);
/* Put icon to remove this publishing */
if (IAmTheAuthor && !ShowNoteAlone)
if (IAmTheAuthor)
Soc_PutFormToRemoveSocialPublishing (SocNot->NotCod);
/* Show comments */