chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Admin: add config setting "catalog_settings" BT#16475

Browse Source
pull/3090/head
Julio Montoya 6 years ago
parent 020197b6bb
commit 50bdbb1180
3 changed files with 59 additions and 36 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      main/auth/courses_controller.php
  2. 3
      main/install/configuration.dist.php
  3. 79
      main/template/default/auth/session_catalog.tpl

13
main/auth/courses_controller.php
Unescape View File

@ -389,6 +389,7 @@ class CoursesController
$tpl->assign('web_session_courses_ajax_url', api_get_path(WEB_AJAX_PATH).'course.ajax.php');
$tpl->assign('sessions', $sessionsBlocks);
$tpl->assign('already_subscribed_label', $this->getAlreadyRegisteredInSessionLabel());
$tpl->assign('catalog_settings', self::getCatalogSearchSettings());
$contentTemplate = $tpl->get_template('auth/session_catalog.tpl');
@ -426,12 +427,24 @@ class CoursesController
$tpl->assign('search_token', Security::get_token());
$tpl->assign('keyword', Security::remove_XSS($keyword));
$tpl->assign('sessions', $sessionsBlocks);
$tpl->assign('catalog_settings', self::getCatalogSearchSettings());
$contentTemplate = $tpl->get_template('auth/session_catalog.tpl');
$tpl->display($contentTemplate);
}
public static function getCatalogSearchSettings()
{
$settings = api_get_configuration_value('catalog_settings');
if (empty($settings)) {
// Default everything is visible
$settings = ['sessions' => ['by_title' => true, 'by_date' => true, 'by_tag' => true]];
}
return $settings;
}
/**
* @param int $active
*

3
main/install/configuration.dist.php
Unescape View File

@ -1367,6 +1367,9 @@ ALTER TABLE notification_event ADD COLUMN event_id INT NULL;
// Allow start/end dates in "My courses" page (user_portal.php)
//$_configuration['allow_session_dates_in_user_portal'] = false;
// Catalog search settings visibility
// $_configuration['catalog_settings'] = ['sessions' => ['by_title' => true, 'by_date' => true, 'by_tag' => true ]];
// KEEP THIS AT THE END
// -------- Custom DB changes
// Add user activation by confirmation email

79
main/template/default/auth/session_catalog.tpl
Unescape View File

@ -14,6 +14,7 @@
<!-- header catalog session -->
<div class="search-session">
<div class="row">
{% if catalog_settings.sessions.by_title %}
<div class="col-md-4">
<form method="post" action="{{ _p.web_self }}?action=search_session_title">
<label>{{ "Name"|get_lang }}</label>
@ -28,46 +29,52 @@
</div>
</form>
</div>
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-4">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=display_sessions">
<div class="form-group">
<label>{{ "ByDate"|get_lang }}</label>
<div class="input-group">
<input type="date" name="date" id="date" title="{{ 'Date'|get_lang }}"
class="form-control" value="{{ search_date }}" readonly>
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> {{ 'Search'|get_lang }}
</button>
</span>
</div>
</div>
</form>
</div>
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-4">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=search_tag">
<label>{{ "ByTag"|get_lang }}</label>
<div class="input-group">
<input type="text" name="search_tag" title="{{ 'ByTag'|get_lang }}" class="form-control"
value="{{ search_tag }}"/>
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> {{ 'Search'|get_lang }}
</button>
</span>
{% if catalog_settings.sessions.by_date %}
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-4">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=display_sessions">
<div class="form-group">
<label>{{ "ByDate"|get_lang }}</label>
<div class="input-group">
<input type="date" name="date" id="date" title="{{ 'Date'|get_lang }}"
class="form-control" value="{{ search_date }}" readonly>
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> {{ 'Search'|get_lang }}
</button>
</span>
</div>
</div>
</form>
</div>
</div>
{% endif %}
{% if catalog_settings.sessions.by_tag %}
{% if show_courses %}
<div class="col-md-4">
{% else %}
<div class="col-md-4">
{% endif %}
<form method="post" action="{{ _p.web_self }}?action=search_tag">
<label>{{ "ByTag"|get_lang }}</label>
<div class="input-group">
<input type="text" name="search_tag" title="{{ 'ByTag'|get_lang }}" class="form-control"
value="{{ search_tag }}"/>
<span class="input-group-btn">
<button class="btn btn-default" type="submit">
<em class="fa fa-search"></em> {{ 'Search'|get_lang }}
</button>
</span>
</div>
</form>
</div>
</div>
{% endif %}
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save