Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-05 00:05:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.26.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-10-20 20:02:59 +02:00
parent 5fd505b315
commit 1fa6916f0e
4 changed files with 14 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -150,13 +150,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.26 (2016-10-20)"
#define Log_PLATFORM_VERSION "SWAD 16.26.1 (2016-10-20)"
#define CSS_FILE "swad16.25.css"
#define JS_FILE "swad15.238.1.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 16.26.1: Oct 20, 2016 Removed warning message in course edition. (205524 lines)
Version 16.26: Oct 20, 2016 New form in institution configuration to move institution to another country. (205566 lines)
2 changes necessary in database:
UPDATE actions SET Txt='Mover institución a otro país' WHERE ActCod='???' AND Language='es';

36
swad_course.c
View File

@ -2420,7 +2420,6 @@ void Crs_ChangeCrsDegInConfig (void)
extern const char *Txt_In_the_year_X_of_the_degree_Y_already_existed_a_course_with_the_name_Z;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_The_course_X_has_been_moved_to_the_degree_Y;
extern const char *Txt_You_dont_have_permission_to_move_courses_to_the_degree_X;
struct Degree NewDeg;
/***** Get parameters from form *****/
@ -2428,12 +2427,12 @@ void Crs_ChangeCrsDegInConfig (void)
if ((NewDeg.DegCod = Deg_GetParamOtherDegCod ()) == -1L)
Lay_ShowErrorAndExit ("Code of degree is missing.");
/***** Get data of new degree *****/
Deg_GetDataOfDegreeByCod (&NewDeg);
/***** If I have permission to change course to this new degree... *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
/***** Check if degree has changed *****/
if (NewDeg.DegCod != Gbl.CurrentCrs.Crs.DegCod)
{
/***** Get data of new degree *****/
Deg_GetDataOfDegreeByCod (&NewDeg);
/***** If name of course was in database in the new degree... *****/
if (Crs_CheckIfCrsNameExistsInYearOfDeg ("ShortName",Gbl.CurrentCrs.Crs.ShortName,-1L,
NewDeg.DegCod,Gbl.CurrentCrs.Crs.Year))
@ -2465,12 +2464,6 @@ void Crs_ChangeCrsDegInConfig (void)
Gbl.CurrentDeg.Deg.FullName);
}
}
else // I have no permission to change course to this new degree
{
Gbl.Error = true;
sprintf (Gbl.Message,Txt_You_dont_have_permission_to_move_courses_to_the_degree_X,
NewDeg.FullName);
}
}
/*****************************************************************************/
@ -2497,7 +2490,6 @@ void Crs_ChangeCrsDegree (void)
extern const char *Txt_In_the_year_X_of_the_degree_Y_already_existed_a_course_with_the_name_Z;
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_The_course_X_has_been_moved_to_the_degree_Y;
extern const char *Txt_You_dont_have_permission_to_move_courses_to_the_degree_X;
struct Course *Crs;
struct Degree NewDeg;
@ -2512,13 +2504,13 @@ void Crs_ChangeCrsDegree (void)
if ((NewDeg.DegCod = Deg_GetParamOtherDegCod ()) == -1L)
Lay_ShowErrorAndExit ("Code of degree is missing.");
/***** Get data of course and new degree *****/
Crs_GetDataOfCourseByCod (Crs);
Deg_GetDataOfDegreeByCod (&NewDeg);
/***** If I have permission to change course to this new degree... *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
/***** Check if degree has changed *****/
if (NewDeg.DegCod != Gbl.CurrentCrs.Crs.DegCod)
{
/***** Get data of course and new degree *****/
Crs_GetDataOfCourseByCod (Crs);
Deg_GetDataOfDegreeByCod (&NewDeg);
/***** If name of course was in database in the new degree... *****/
if (Crs_CheckIfCrsNameExistsInYearOfDeg ("ShortName",Crs->ShortName,-1L,
NewDeg.DegCod,Crs->Year))
@ -2545,12 +2537,6 @@ void Crs_ChangeCrsDegree (void)
Crs->FullName,NewDeg.FullName);
}
}
else // I have no permission to change course to this new degree
{
Gbl.Error = true;
sprintf (Gbl.Message,Txt_You_dont_have_permission_to_move_courses_to_the_degree_X,
NewDeg.FullName);
}
}
/*****************************************************************************/

2
swad_degree.c
View File

@ -2497,7 +2497,7 @@ void Deg_ChangeDegCtrInConfig (void)
/* Get parameter with centre code */
NewCtr.CtrCod = Ctr_GetParamOtherCtrCod ();
/***** Check if institution has changed *****/
/***** Check if centre has changed *****/
if (NewCtr.CtrCod != Gbl.CurrentDeg.Deg.CtrCod)
{
/***** Get data of new centre *****/

30
swad_text.c
View File

@ -52905,36 +52905,6 @@ const char *Txt_You_dont_have_permission_to_edit_this_course =
"You don't have permission to edit this course."; // Necessita de tradução
#endif
const char *Txt_You_dont_have_permission_to_move_courses_to_the_degree_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Usted no tiene permiso para mover asignaturas"
" a la titulaci&oacute;n <strong>%s</strong>."; // Necessita traduccio
#elif L==2
"You don't have permission to move courses"
" to the degree <strong>%s</strong>."; // Need Übersetzung
#elif L==3
"You don't have permission to move courses"
" to the degree <strong>%s</strong>.";
#elif L==4
"Usted no tiene permiso para mover asignaturas"
" a la titulaci&oacute;n <strong>%s</strong>.";
#elif L==5
"You don't have permission to move courses"
" to the degree <strong>%s</strong>."; // Besoin de traduction
#elif L==6
"Usted no tiene permiso para mover asignaturas"
" a la titulaci&oacute;n <strong>%s</strong>."; // Okoteve traducción
#elif L==7
"Non hai l'autorizzazione di spostare i corsi"
" nella laurea <strong>%s</strong>.";
#elif L==8
"You don't have permission to move courses"
" to the degree <strong>%s</strong>."; // Potrzebujesz tlumaczenie
#elif L==9
"You don't have permission to move courses"
" to the degree <strong>%s</strong>."; // Necessita de tradução
#endif
const char *Txt_You_dont_have_permission_to_perform_this_action =
#if L==1
"Vost&egrave; no t&eacute; perm&iacute;s"