Version 14.37.2

This commit is contained in:
Antonio Cañas Vargas 2014-12-13 17:17:42 +01:00
parent b3fa05ddf0
commit 2c8e7ec4f8
5 changed files with 15 additions and 7 deletions

View File

@ -35,13 +35,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.37.1 (2014/12/13)"
#define Log_PLATFORM_VERSION "SWAD 14.37.2 (2014/12/13)"
// 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 | tail -1
/*
Version 14.37.1 :Dic 12, 2014 Fixed bug in HTML entities in swad_text.c (translation).
Version 14.37.2 :Dic 13, 2014 Changes in search of courses link in "my courses". (170874 lines)
Version 14.37.1 :Dic 13, 2014 Fixed bug in HTML entities in swad_text.c (translation).
Guests can view option "my courses" on profile tab.
Reordering of options in profile tab. (170866 lines)
Version 14.37 :Dic 12, 2014 New module swad_account for user's account. (170863 lines)

View File

@ -2617,7 +2617,14 @@ static void Usr_PutFormToSearchCourses (void)
extern const char *Txt_Search_courses;
/***** Put form to search / select courses *****/
Act_FormStart (ActSysReqSch);
Act_FormStart ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsReqSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegReqSch :
(Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrReqSch :
(Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsReqSch :
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch :
ActSysReqSch)))));
Sco_PutParamScope (Sco_SCOPE_PLATFORM);
Par_PutHiddenParamUnsigned ("WhatToSearch",(unsigned) Sch_SEARCH_COURSES);
Act_LinkFormSubmit (Txt_Search_courses,The_ClassFormul[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("search",Txt_Search_courses,Txt_Search_courses);
fprintf (Gbl.F.Out,"</form>");

View File

@ -632,7 +632,7 @@ static void Lay_WritePageTopHeading (void)
ActSysSch)))));
Sco_PutParamScope (Sco_SCOPE_PLATFORM);
Par_PutHiddenParamUnsigned ("WhatToSearch",(unsigned) Sch_SEARCH_ALL);
Sch_PutFormToSearch (Gbl.Prefs.PathTheme);
Sch_PutFormToSearchOnHead (Gbl.Prefs.PathTheme);
fprintf (Gbl.F.Out,"</form>"
"</td>");
}

View File

@ -261,7 +261,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
fprintf (Gbl.F.Out,"</select>");
/***** String to find *****/
Sch_PutFormToSearch (Gbl.Prefs.IconsURL);
Sch_PutFormToSearchOnHead (Gbl.Prefs.IconsURL);
/***** Send button *****/
fprintf (Gbl.F.Out,"<br />"
@ -304,7 +304,7 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch)
/*********** Put form to search courses, teachers, documents... **************/
/*****************************************************************************/
void Sch_PutFormToSearch (const char *IconURL)
void Sch_PutFormToSearchOnHead (const char *IconURL)
{
extern const char *Txt_Search;

View File

@ -63,7 +63,7 @@ void Sch_ReqInsSearch (void);
void Sch_ReqCtrSearch (void);
void Sch_ReqDegSearch (void);
void Sch_ReqCrsSearch (void);
void Sch_PutFormToSearch (const char *IconURL);
void Sch_PutFormToSearchOnHead (const char *IconURL);
void Sch_GetParamsSearch (void);
void Sch_SysSearch (void);
void Sch_CtySearch (void);