projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Displays group positions on group's main page.
[platal.git]
/
modules
/
profile.php
diff --git
a/modules/profile.php
b/modules/profile.php
index
f9b08fa
..
2728a08
100644
(file)
--- a/
modules/profile.php
+++ b/
modules/profile.php
@@
-318,6
+318,8
@@
class ProfileModule extends PLModule
$opened_tab = $hrpid;
$hrpid = $aux;
$url_error = true;
$opened_tab = $hrpid;
$hrpid = $aux;
$url_error = true;
+ } else {
+ $url_error = false;
}
$profile = $this->findProfile($hrpid);
if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
}
$profile = $this->findProfile($hrpid);
if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
@@
-328,7
+330,6
@@
class ProfileModule extends PLModule
}
// Build the page
}
// Build the page
- $page->addJsLink('ajax.js');
$page->addJsLink('education.js', false); /* dynamic content */
$page->addJsLink('grades.js', false); /* dynamic content */
$page->addJsLink('profile.js');
$page->addJsLink('education.js', false); /* dynamic content */
$page->addJsLink('grades.js', false); /* dynamic content */
$page->addJsLink('profile.js');
@@
-399,7
+400,7
@@
class ProfileModule extends PLModule
$page->assign('address', array());
}
$page->assign('address', array());
}
- function handler_ajax_tel(&$page, $prefid, $prefname, $telid)
+ function handler_ajax_tel(&$page, $prefid, $prefname, $telid
, $subField, $mainField, $mainId
)
{
pl_content_headers("text/html");
$page->changeTpl('profile/phone.tpl', NO_SKIN);
{
pl_content_headers("text/html");
$page->changeTpl('profile/phone.tpl', NO_SKIN);
@@
-408,6
+409,11
@@
class ProfileModule extends PLModule
$page->assign('telid', $telid);
$phone = new Phone();
$page->assign('tel', $phone->toFormArray());
$page->assign('telid', $telid);
$phone = new Phone();
$page->assign('tel', $phone->toFormArray());
+ if ($mainField) {
+ $page->assign('subField', $subField);
+ $page->assign('mainField', $mainField);
+ $page->assign('mainId', $mainId);
+ }
}
function handler_ajax_edu(&$page, $eduid, $class)
}
function handler_ajax_edu(&$page, $eduid, $class)
@@
-513,7
+519,7
@@
class ProfileModule extends PLModule
// Retrieves referents' countries.
$res = XDB::query(
// Retrieves referents' countries.
$res = XDB::query(
- "SELECT gc.country
FR
+ "SELECT gc.country
FROM profile_mentor_country AS m
LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2)
WHERE pid = {?}", $pf->id());
FROM profile_mentor_country AS m
LEFT JOIN geoloc_countries AS gc ON (m.country = gc.iso_3166_1_a2)
WHERE pid = {?}", $pf->id());
@@
-527,11
+533,11
@@
class ProfileModule extends PLModule
pl_content_headers("text/html");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
$page->assign('name', 'pays_sel');
pl_content_headers("text/html");
$page->changeTpl('include/field.select.tpl', NO_SKIN);
$page->assign('name', 'pays_sel');
- $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.country
FR
AS field
+ $it = XDB::iterator("SELECT gc.iso_3166_1_a2 AS id, gc.country AS field
FROM geoloc_countries AS gc
INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2)
GROUP BY iso_3166_1_a2
FROM geoloc_countries AS gc
INNER JOIN profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2)
GROUP BY iso_3166_1_a2
- ORDER BY country
FR
");
+ ORDER BY country");
$page->assign('list', $it);
}
$page->assign('list', $it);
}
@@
-750,10
+756,10
@@
class ProfileModule extends PLModule
$table_editor->describe('degree', 'niveau', true);
$table_editor->apply($page, $action, $id);
}
$table_editor->describe('degree', 'niveau', true);
$table_editor->apply($page, $action, $id);
}
- function handler_admin_education_degree_set(&$page, $action = 'list', $id = null) {
+ function handler_admin_education_degree_set(&$page, $action = 'list', $id = null
, $id2 = null
) {
$page->setTitle('Administration - Correspondances formations - niveau de formation');
$page->assign('title', 'Gestion des correspondances formations - niveau de formation');
$page->setTitle('Administration - Correspondances formations - niveau de formation');
$page->assign('title', 'Gestion des correspondances formations - niveau de formation');
- $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true);
+ $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true
, 'degreeid'
);
$table_editor->describe('eduid', 'id formation', true);
$table_editor->describe('degreeid', 'id niveau', true);
$table_editor->describe('eduid', 'id formation', true);
$table_editor->describe('degreeid', 'id niveau', true);
@@
-764,7
+770,7
@@
class ProfileModule extends PLModule
$table_editor->add_option_table('profile_education_degree_enum','profile_education_degree_enum.id = t.degreeid');
$table_editor->add_option_field('profile_education_degree_enum.degree', 'degree_name', 'niveau');
$table_editor->add_option_table('profile_education_degree_enum','profile_education_degree_enum.id = t.degreeid');
$table_editor->add_option_field('profile_education_degree_enum.degree', 'degree_name', 'niveau');
- $table_editor->apply($page, $action, $id);
+ $table_editor->apply($page, $action, $id
, $id2
);
}
function handler_admin_sections(&$page, $action = 'list', $id = null) {
$page->setTitle('Administration - Sections');
}
function handler_admin_sections(&$page, $action = 'list', $id = null) {
$page->setTitle('Administration - Sections');