diff --git a/swad_action.c b/swad_action.c index c31a2c4b4..35b798653 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1517,7 +1517,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeCty */{ 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,Cty_ListCountries1 ,Cty_ListCountries2 ,"earth64x64.gif" }, /* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x1E0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Deg_SeePending ,"hierarchy64x64.png" }, /* ActReqRemOldCrs */{1109, 3,TabSys,ActReqRemOldCrs , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_AskRemoveOldCrss ,"removeusers64x64.gif" }, - /* ActSeeDegTyp */{1013, 4,TabSys,ActSeeDegTyp , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,DT_SeeDegreeTypesInSysTab ,"grouptypes64x64.gif" }, + /* ActSeeDegTyp */{1013, 4,TabSys,ActSeeDegTyp , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,DT_SeeDegreeTypesInSysTab ,"grouptypes64x64.gif" }, /* ActSeeMai */{ 855, 5,TabSys,ActSeeMai , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Mai_SeeMailDomains ,"email64x64.gif" }, /* ActSeeBan */{1137, 6,TabSys,ActSeeBan , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ban_SeeBanners ,"picture64x64.gif" }, /* ActSeeLnk */{ 748, 7,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Lnk_SeeLinks ,"link64x64.gif" }, diff --git a/swad_changelog.h b/swad_changelog.h index fed88c158..dd1125bfd 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -216,7 +216,8 @@ // 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.164.3: Mar 24, 2017 Types of degree in system tab restricted to system admins only. (? lines) + Version 16.164.3: Mar 24, 2017 Fixed bug in types of degree. + Types of degree in system tab restricted to system admins only. (217579 lines) Version 16.164.2: Mar 24, 2017 Code refactoring in types of degree. (217576 lines) Version 16.164.1: Mar 24, 2017 Statistics about types of degree depends on the selected scope. (217575 lines) Version 16.164: Mar 24, 2017 New figure in statistics: types of degree. (217510 lines) diff --git a/swad_degree_type.c b/swad_degree_type.c index 69a1fbadc..264b25359 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -62,7 +62,8 @@ extern struct Globals Gbl; /**************************** Private prototypes *****************************/ /*****************************************************************************/ -static void DT_SeeDegreeTypes (Act_Action_t NextAction,DT_Order_t DefaultOrder); +static void DT_SeeDegreeTypes (Act_Action_t NextAction,Sco_Scope_t Scope, + DT_Order_t DefaultOrder); static DT_Order_t DT_GetParamDegTypOrder (DT_Order_t DefaultOrder); static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder); @@ -127,17 +128,18 @@ void DT_WriteSelectorDegreeTypes (void) void DT_SeeDegreeTypesInSysTab (void) { - DT_SeeDegreeTypes (ActSeeDegTyp, + DT_SeeDegreeTypes (ActSeeDegTyp,Sco_SCOPE_SYS, DT_ORDER_BY_DEGREE_TYPE); // Default order if not specified } void DT_SeeDegreeTypesInStaTab (void) { - DT_SeeDegreeTypes (ActSeeUseGbl, + DT_SeeDegreeTypes (ActSeeUseGbl,Gbl.Scope.Current, DT_ORDER_BY_NUM_DEGREES); // Default order if not specified } -static void DT_SeeDegreeTypes (Act_Action_t NextAction,DT_Order_t DefaultOrder) +static void DT_SeeDegreeTypes (Act_Action_t NextAction,Sco_Scope_t Scope, + DT_Order_t DefaultOrder) { DT_Order_t SelectedOrder; @@ -145,7 +147,7 @@ static void DT_SeeDegreeTypes (Act_Action_t NextAction,DT_Order_t DefaultOrder) SelectedOrder = DT_GetParamDegTypOrder (DefaultOrder); /***** Get list of degree types *****/ - DT_GetListDegreeTypes (Gbl.Scope.Current,SelectedOrder); + DT_GetListDegreeTypes (Scope,SelectedOrder); /***** List degree types *****/ DT_ListDegreeTypes (NextAction,SelectedOrder);