mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-05 00:05:23 +02:00
Version 15.4.2
This commit is contained in:
parent
0b15e678c9
commit
59818a13ff
|
@ -1587,14 +1587,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActRenPlcSho */{ 894,-1,TabIns,ActSeePlc ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Plc_RenamePlaceShort ,NULL},
|
||||
/* ActRenPlcFul */{ 895,-1,TabIns,ActSeePlc ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Plc_RenamePlaceFull ,NULL},
|
||||
|
||||
/* ActEdiHld */{ 713,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_EditHolidays ,NULL},
|
||||
/* ActNewHld */{ 714,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RecFormNewHoliday ,NULL},
|
||||
/* ActRemHld */{ 716,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RemoveHoliday ,NULL},
|
||||
/* ActChgHldPlc */{ 896,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL},
|
||||
/* ActChgHldTyp */{ 715,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeHolidayType ,NULL},
|
||||
/* ActChgHldStrDat */{ 717,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeStartDate ,NULL},
|
||||
/* ActChgHldEndDat */{ 718,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeEndDate ,NULL},
|
||||
/* ActRenHld */{ 766,-1,TabIns,ActSeeHld ,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RenameHoliday ,NULL},
|
||||
/* ActEdiHld */{ 713,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_EditHolidays ,NULL},
|
||||
/* ActNewHld */{ 714,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RecFormNewHoliday ,NULL},
|
||||
/* ActRemHld */{ 716,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RemoveHoliday ,NULL},
|
||||
/* ActChgHldPlc */{ 896,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL},
|
||||
/* ActChgHldTyp */{ 715,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeHolidayType ,NULL},
|
||||
/* ActChgHldStrDat */{ 717,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeStartDate ,NULL},
|
||||
/* ActChgHldEndDat */{ 718,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_ChangeEndDate ,NULL},
|
||||
/* ActRenHld */{ 766,-1,TabIns,ActSeeHld ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Hld_RenameHoliday ,NULL},
|
||||
|
||||
/* ActChgToSeeDocIns */{1308,-1,TabIns,ActSeeAdmDocIns ,0x180,0x180,0x180,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ShowFileBrowserOrWorks ,NULL},
|
||||
|
||||
|
|
|
@ -98,11 +98,12 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.4.1 (2015/09/30)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.4.2 (2015/10/01)"
|
||||
|
||||
// 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.4.2: Oct 31, 2015 Institution admins can edit holidays. (184863 lines)
|
||||
Version 15.4.1: Sep 30, 2015 Code refactoring in global/course statistics. (184861 lines)
|
||||
Version 15.4: Sep 30, 2015 Changes in global/course statistics forms. (184877 lines)
|
||||
Version 15.3.3: Sep 30, 2015 Changes in layout of form to selected initial and final dates. (185152 lines)
|
||||
|
|
|
@ -92,7 +92,8 @@ void Hld_SeeHolidays (void)
|
|||
Hld_GetListHolidays ();
|
||||
|
||||
/***** Put link (form) to edit holidays *****/
|
||||
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
|
||||
// Institution admins or system admins can edit holidays
|
||||
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
|
||||
Hld_PutFormToEditHlds ();
|
||||
|
||||
/***** Table head *****/
|
||||
|
|
Loading…
Reference in New Issue
Block a user