Minor - update from master

pull/2990/head
Julio 6 years ago
parent 56707d111e
commit 11fe834f06
  1. 2
      main/admin/add_users_to_usergroup.php
  2. 6
      main/admin/grade_models.php
  3. 2
      main/admin/legal_add.php
  4. 2
      main/admin/skill_create.php
  5. 2
      main/admin/skill_edit.php
  6. 2
      main/admin/user_add.php
  7. 3
      main/admin/user_edit.php
  8. 1
      main/announcements/announcements.php
  9. 2
      main/social/group_view.php
  10. 4
      main/ticket/categories_add_user.php

@ -30,7 +30,7 @@ $tool_name = get_lang('SubscribeUsersToClass');
$htmlHeadXtra[] = '
<script>
$(document).ready( function() {
$(function () {
$("#relation").change(function() {
window.location = "add_users_to_usergroup.php?id='.$id.'" +"&relation=" + $(this).val();
});

@ -204,5 +204,9 @@ switch ($action) {
$obj->display();
break;
}
echo '<script> $(document).ready(function(){ $("input").removeClass("form-control"); }); </script>';
echo '<script>
$(function () {
$("input").removeClass("form-control");
});
</script>';
Display::display_footer();

@ -187,7 +187,7 @@ $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')]
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
$htmlHeadXtra[] = '<script>
$(document).ready(function(){
$(function () {
'.$jqueryReady.'
});
</script>';

@ -47,7 +47,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
if (!empty($jquery_ready_content)) {
$htmlHeadXtra[] = '<script>
$(document).ready(function(){
$(function () {
'.$jquery_ready_content.'
});
</script>';

@ -63,7 +63,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// in the $(document).ready javascript function
if (!empty($jquery_ready_content)) {
$htmlHeadXtra[] = '<script>
$(document).ready(function(){
$(function () {
'.$jquery_ready_content.'
});
</script>';

@ -324,7 +324,7 @@ $jquery_ready_content = $returnParams['jquery_ready_content'];
// the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
$htmlHeadXtra[] = '<script>
$(document).ready(function(){
$(function () {
'.$jquery_ready_content.'
});
</script>';

@ -329,9 +329,8 @@ if ($allowEmailTemplate) {
}
// the $jqueryReadyContent variable collects all functions that will be load in the
// $(document).ready javascript function
$htmlHeadXtra[] = '<script>
$(document).ready(function(){
$(function () {
'.$jqueryReadyContent.'
});
</script>';

@ -250,7 +250,6 @@ switch ($action) {
'index' => 'actions',
'width' => '150',
'align' => 'left',
//'formatter' => 'action_formatter',
'sortable' => 'false',
],
];

@ -322,7 +322,7 @@ $tpl = new Template(null);
// Block Social Avatar
SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'groups', $group_id);
//Block Social Menu
$social_menu_block = SocialManager::show_social_menu('groups', $group_id);
$tpl->setHelp('Groups');
$tpl->assign('create_link', $create_thread_link);

@ -9,7 +9,7 @@ require_once __DIR__.'/../inc/global.inc.php';
api_protect_admin_script(true);
$categoryId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : '';
$projectId = isset($_GET['project_id']) ? (int) $_GET['project_id'] : 0;
$categoryInfo = TicketManager::getCategory($categoryId);
@ -49,7 +49,7 @@ if ($form->validate()) {
TicketManager::deleteAllUserInCategory($categoryId);
TicketManager::addUsersToCategory($categoryId, $values['users']);
Display::addFlash(Display::return_message(get_lang('Updated')));
header("Location: ".api_get_self()."?id=".$categoryId.'&project_id='.$projectId);
header('Location: '.api_get_self().'?id='.$categoryId.'&project_id='.$projectId);
exit;
}

Loading…
Cancel
Save