Skip to content
Snippets Groups Projects

Feature/228 warning user without worker

Merged Carlos Vega requested to merge feature/228_warning_user_without_worker into master

Closed previous merge request !163 (closed) to add more commits. This merge request fixes issues #228 (closed) and #239 (closed). Tests pass.

Change log:

  • Removed get_details method and changed extend_context method to use Worker.get_by_user
  • Enhancement: now the superuser also shows a name in the upper right corner or its username if no full_name is available.

AdminLTE.css: changed CSS stuff to style new class .no_worker_warning _base.html: changed header to show a warning message.

worker.py

    @staticmethod
    def get_details(the_user):
        persons = Worker.objects.filter(user=the_user)

        if len(persons) == 0:
            return the_user.get_full_name(), '<No worker information>'
        else:
            person = persons[0]
            role = "N/A"
            if person.roles.filter(study=GLOBAL_STUDY_ID).count() > 0:
-              role = person.roles.filter(study=GLOBAL_STUDY_ID)[0].get_role_display()
+              role = person.role
            return unicode(person), role

Merge request reports

Pipeline #6518 passed

Pipeline passed for 8604e096 on feature/228_warning_user_without_worker

Test coverage 92.66% (-0.01%) from 1 job

Merged by Piotr GawronPiotr Gawron 6 years ago (Sep 24, 2018 9:23am UTC)

Loading

Pipeline #6520 passed

Pipeline passed for a36d9aae on master

Test coverage 92.63% (-0.01%) from 1 job

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply
Loading