From 9890a4b330c1a54f1a24c62cffea290a5fdeb707 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 20 Dec 2013 11:58:47 +0100 Subject: [PATCH] Minor - removing search by type. --- main/work/work.lib.php | 4 ++-- main/work/work.php | 3 +-- main/work/work_list.php | 4 ++-- main/work/work_list_all.php | 4 ++-- main/work/work_list_others.php | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 3831307b6c..63cc9e498a 100644 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -699,7 +699,7 @@ function showStudentWorkGrid() { $courseInfo = api_get_course_info(); $columnModel = array( - array('name'=>'type', 'index'=>'type', 'width'=>'30', 'align'=>'left', 'sortable'=>'false'), + array('name'=>'type', 'index'=>'type', 'width'=>'30', 'align'=>'left', 'sortable' => 'false'), array('name'=>'title', 'index'=>'title', 'width'=>'80', 'align'=>'left'), array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'500', 'align'=>'left', 'sortable'=>'false') ); @@ -745,7 +745,7 @@ function showStudentWorkGrid() function showTeacherWorkGrid() { $columnModel = array( - array('name'=>'type', 'index'=>'type', 'width'=>'50', 'align'=>'left'), + array('name'=>'type', 'index'=>'type', 'width'=>'50', 'align'=>'left', 'sortable' => 'false'), array('name'=>'title', 'index'=>'title', 'width'=>'300', 'align'=>'left'), array('name'=>'expires_on', 'index'=>'expires_on', 'width'=>'150', 'align'=>'left'), array('name'=>'end_on', 'index'=>'end_on', 'width'=>'150', 'align'=>'left'), diff --git a/main/work/work.php b/main/work/work.php index fb005a1207..5cd9ebebb5 100644 --- a/main/work/work.php +++ b/main/work/work.php @@ -224,7 +224,7 @@ switch ($action) { $move_to_path = $move_to_path .'/'; } - //security fix: make sure they can't move files that are not in the document table + // Security fix: make sure they can't move files that are not in the document table if ($path = get_work_path($item_id)) { if (move($course_dir.'/'.$path, $base_work_dir . $move_to_path)) { @@ -248,7 +248,6 @@ switch ($action) { } } - /* Delete dir */ if ($is_allowed_to_edit && $action == 'delete_dir') { diff --git a/main/work/work_list.php b/main/work/work_list.php index 5baec9b308..d3c72cd42c 100644 --- a/main/work/work_list.php +++ b/main/work/work_list.php @@ -111,7 +111,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) ); $column_model = array ( - array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => 'true'), array('name'=>'qualification', 'index'=>'qualification', 'width'=>'10', 'align'=>'left', 'search' => 'true'), array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'30', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true'), @@ -129,7 +129,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) ); $column_model = array ( - array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'5', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'title', 'index'=>'title', 'width'=>'60', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"), array('name'=>'sent_date', 'index'=>'sent_date', 'width'=>'30', 'align'=>'left', 'search' => 'true', 'wrap_cell' => 'true', 'sortable'=>'false'), array('name'=>'actions', 'index'=>'actions', 'width'=>'20', 'align'=>'left', 'search' => 'false', 'sortable'=>'false') diff --git a/main/work/work_list_all.php b/main/work/work_list_all.php index 204fe939f2..07930ffcbb 100644 --- a/main/work/work_list_all.php +++ b/main/work/work_list_all.php @@ -150,7 +150,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) get_lang('Actions') ); $column_model = array ( - array('name'=>'type', 'index'=>'file', 'width'=>'10', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'10', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => 'true'), @@ -172,7 +172,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) ); $column_model = array ( - array('name'=>'type', 'index'=>'file', 'width'=>'10', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'10', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"), diff --git a/main/work/work_list_others.php b/main/work/work_list_others.php index 847d93864e..b34e7584ea 100644 --- a/main/work/work_list_others.php +++ b/main/work/work_list_others.php @@ -85,7 +85,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) get_lang('Actions') ); $column_model = array( - array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => 'true'), @@ -100,7 +100,7 @@ if (!empty($work_data['enable_qualification']) && !empty($check_qualification)) get_lang('Type'), get_lang('FirstName'), get_lang('LastName'), get_lang('Title'), get_lang('Date'), get_lang('Actions') ); $column_model = array ( - array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => 'false'), + array('name'=>'type', 'index'=>'file', 'width'=>'12', 'align'=>'left', 'search' => 'false', 'sortable' => 'false'), array('name'=>'firstname', 'index'=>'firstname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'lastname', 'index'=>'lastname', 'width'=>'35', 'align'=>'left', 'search' => 'true'), array('name'=>'title', 'index'=>'title', 'width'=>'40', 'align'=>'left', 'search' => 'false', 'wrap_cell' => "true"),