Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix User Assignment on Job Detail #825

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

Merged
PJEstrada merged 1 commit into from
Apr 19, 2022
Merged

Fix User Assignment on Job Detail #825

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
20 changes: 11 additions & 9 deletions default/methods/task/task_template/job_new_or_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,15 +678,17 @@ def new_or_update_core(session,
job.allow_reviews = allow_reviews
job.review_chance = (0 if review_chance == None else review_chance) / 100

log = job.update_member_list(
member_list_ids = member_list_ids,
session = session,
log = log)

log = job.update_reviewer_list(
session = session,
reviewer_list_ids = reviewer_list_ids,
log = log)
if member_list_ids is not None:
log = job.update_member_list(
member_list_ids = member_list_ids,
session = session,
log = log)

if reviewer_list_ids is not None:
log = job.update_reviewer_list(
session = session,
reviewer_list_ids = reviewer_list_ids,
log = log)

if default_userscript_id:
default_userscript = UserScript.get(
Expand Down
9 changes: 8 additions & 1 deletion frontend/src/components/dialogs/add_assignee.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,14 @@ export default Vue.extend({
this.$forceUpdate();
},
on_assign: function() {
this.$emit("assign", this.member_list_ids)
let user_id_list = [];
for (let member_id of this.member_list_ids){
let user = this.member_list.find(m => m.member_id === member_id);
if(user){
user_id_list.push(user.id)
}
}
this.$emit("assign", user_id_list)
},
on_cancel: function() {
this.$emit("close")
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/task/task/task_list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ export default Vue.extend({
{ name: "Archive", value: "archive" },
{ name: "Assign annotators", value: 'assign' },
{ name: "Remove annotators", value: 'remove' },
],
],

task_assign_dialog_open: false,
reviewers_list: [],
Expand Down
2 changes: 1 addition & 1 deletion shared/database/task/job/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ def get_reviewers(self, session):
return users

def get_assignees(self, session):

rels = User_To_Job.list(session = session, job = self, relation = 'annotator')
users = [rel.user for rel in rels]
return users
Expand Down Expand Up @@ -491,7 +492,6 @@ def update_member_list(
session,
log: dict,
add_to_session: bool = True):

# TODO feel like this could be a more generic pattern
# main id is given a list of ids handle updating the attachments
# TODO abstract more functions here...
Expand Down