Skip to content

feat(search): Implement 'Copyright Owner' filter in advanced search by joinin… #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sreeshanth-soma wants to merge 1 commit into
base: 5.5-develop
Choose a base branch
from
Open

feat(search): Implement 'Copyright Owner' filter in advanced search by joinin… #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion core/models/media_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ public function search($args = [])
$this->db->leftjoin('media_categories', 'media.category_id', 'media_categories.id');
$this->db->leftjoin('countries', 'media.country', 'countries.country_id');
$this->db->leftjoin('languages', 'media.language', 'languages.language_id');
$this->db->leftjoin('users', 'media.owner_id', 'users.id');

if ($params['sort_by'] == 'category_name') {
$params['sort_by'] = 'media_categories.name';
Expand Down Expand Up @@ -954,7 +955,7 @@ public function search_filters_validate($args = [])
OBFHelpers::require_args($args, ['filters']);
$filters = $args['filters'];

$allowed_filters = ['comments','artist','title','album','year','type','category','country','language','genre','duration','is_copyright_owner','status','dynamic_select'];
$allowed_filters = ['comments','artist','title','album','year','type','category','country','language','genre','duration','is_copyright_owner','copyright_owner','status','dynamic_select'];
$allowed_operators = [
// deprecated
'like',
Expand Down Expand Up @@ -1036,6 +1037,7 @@ public function search_filters_where_array($args = [])
$column_array['duration'] = 'media.duration';
$column_array['comments'] = 'media.comments';
$column_array['is_copyright_owner'] = 'media.is_copyright_owner';
$column_array['copyright_owner'] = 'users.username';
$column_array['dynamic_select'] = 'media.dynamic_select';

$metadata_fields = $this->models->mediametadata('get_all');
Expand Down Expand Up @@ -1125,6 +1127,11 @@ public function search_filters_where_array($args = [])
}

$where_array[] = $tmp_sql;

// copyright_owner filter: also enforce that is_copyright_owner = 1
if ($filter['filter'] == 'copyright_owner') {
$where_array[] = 'media.is_copyright_owner = 1';
}
}

return $where_array;
Expand Down
1 change: 1 addition & 0 deletions public/html/sidebar/advanced_search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<option value="is_copyright_owner" data-compare="select" data-value="bool" data-t>
Is Copyright Owner
</option>
<option value="copyright_owner" data-compare="text" data-value="text" data-t>Copyright Owner</option>
<option value="status" data-compare="select" data-value="status" data-t>Status</option>
<option value="dynamic_select" data-compare="select" data-value="bool" data-t>Include in Dynamic Selections?</option>
</select>
Expand Down
Loading