diff --git a/swad_changelog.h b/swad_changelog.h
index 62cb03e09..4d82c2305 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -121,7 +121,6 @@
// TODO: Messages in msg_content_deleted older than a certain time should be deleted to ensure the protection of personal data
// TODO: FIX BUG: A teacher uploads a document in course documents zone, then he/she unregister from course, then he/she search for his/her documents, a document is shown in results but he/she can not view it
// TODO: Add Stack Exchange to webs/networks
-// TODO: Degree in list of notifications should link to internal degree
// TODO: Modify WS function getUsers changing: userRole to indicate all users, and a new parameter filter (search string (name, @nickname, mail)) to restring number of users
// TODO: Add a new WS function to count the nunmber of users to return in call to function getUsers
@@ -130,13 +129,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.233.3 (2016-06-27)"
+#define Log_PLATFORM_VERSION "SWAD 15.233.4 (2016-06-27)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.226.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.233.4: Jun 27, 2015 Changes in links in list of notifications. (203065 lines)
Version 15.233.3: Jun 27, 2015 Fixed bug in list of admins. (203074 lines)
Version 15.233.2: Jun 27, 2015 Code refactoring in search of users. (203072 lines)
Version 15.233.1: Jun 27, 2015 New restrictions in length of search string. (203117 lines)
diff --git a/swad_notification.c b/swad_notification.c
index 2316e30ce..e0bc9032c 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -540,7 +540,7 @@ void Ntf_ShowMyNotifications (void)
else
fprintf (Gbl.F.Out,"");
}
- else if (Crs.CrsCod > 0)
+ else
{
if (PutLink)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Crs.CrsCod,&UsrDat,Cod);
@@ -549,7 +549,18 @@ void Ntf_ShowMyNotifications (void)
Act_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor);
else
fprintf (Gbl.F.Out,"",ClassAnchor);
- fprintf (Gbl.F.Out,"%s: %s",Txt_Course,Crs.ShortName);
+
+ if (Crs.CrsCod > 0)
+ fprintf (Gbl.F.Out,"%s: %s",Txt_Course,Crs.ShortName);
+ else if (Deg.DegCod > 0)
+ fprintf (Gbl.F.Out,"%s: %s",Txt_Degree,Deg.ShortName);
+ else if (Ctr.CtrCod > 0)
+ fprintf (Gbl.F.Out,"%s: %s",Txt_Centre,Ctr.ShortName);
+ else if (Ins.InsCod > 0)
+ fprintf (Gbl.F.Out,"%s: %s",Txt_Institution,Ins.ShortName);
+ else
+ fprintf (Gbl.F.Out,"-");
+
if (PutLink)
{
fprintf (Gbl.F.Out,"");
@@ -558,24 +569,6 @@ void Ntf_ShowMyNotifications (void)
else
fprintf (Gbl.F.Out,"");
}
- else if (Deg.DegCod > 0)
- {
- fprintf (Gbl.F.Out,"%s: %s",
- Deg.WWW,ClassAnchor,
- Txt_Degree,Deg.ShortName);
- }
- else if (Ctr.CtrCod > 0)
- {
- fprintf (Gbl.F.Out,"%s: %s",
- Ctr.WWW,ClassAnchor,
- Txt_Centre,Ctr.ShortName);
- }
- else if (Ins.InsCod > 0)
- fprintf (Gbl.F.Out,"%s: %s",
- Ins.WWW,ClassAnchor,
- Txt_Institution,Ins.ShortName);
- else
- fprintf (Gbl.F.Out,"-");
fprintf (Gbl.F.Out,"");
/* Write date and time */