Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !387 opened Aug 16, 2016 by Czémán Arnold@cemiarni 
  • Report abuse
Report abuse

Rework VM list filter

More info: #458 (closed)

  • Discussion 1
  • Commits 6
  • Pipelines 4
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Czémán Arnold @cemiarni

    Added 1 commit:

    • 749d0686 - dashboard: move VmDescFilterMixin into FilterMixin and rewrite query for 'shared' stype
    Aug 16, 2016

    Added 1 commit:

    • 749d0686 - dashboard: move VmDescFilterMixin into FilterMixin and rewrite query for 'shared' stype
    Added 1 commit: * 749d0686 - dashboard: move VmDescFilterMixin into FilterMixin and rewrite query for 'shared' stype
    Toggle commit list
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Sep 05, 2016
    circle/dashboard/views/util.py
    164 shared = stype == 'shared' or stype == 'all'
    165 level = 'owner' if stype == 'owned' else 'user'
    166 user = self.request.user
    165 167 queryset = model.get_objects_with_level(
    166 level, self.request.user,
    167 group_also=shared, disregard_superuser=not superuser,
    168 )
    168 level, user, group_also=shared, disregard_superuser=not superuser)
    169 if stype == 'owned':
    170 queryset = queryset.filter(owner=user)
    171 elif stype == 'shared':
    172 queryset = queryset.filter(owner=user)
    173
    174 pk_list = []
    175 for record in queryset:
    176 sum = record.object_level_set.annotate(
    • Kálmán Viktor @kviktor commented Sep 05, 2016
      Owner

      sum is a built-in function, while this works it's not the nicest thing

      `sum` is a built-in function, while this works it's not the nicest thing
    Please register or sign in to reply
  • Czémán Arnold @cemiarni

    Added 8 commits:

    • 749d0686...a8272957 - 6 commits from branch master
    • 868c2ca6 - Merge branch 'master' into issue_458
    • c894c76d - dashboard: small fix in FilterMixin
    Sep 12, 2016

    Added 8 commits:

    • 749d0686...a8272957 - 6 commits from branch master
    • 868c2ca6 - Merge branch 'master' into issue_458
    • c894c76d - dashboard: small fix in FilterMixin
    Added 8 commits: * 749d0686...a8272957 - 6 commits from branch `master` * 868c2ca6 - Merge branch 'master' into issue_458 * c894c76d - dashboard: small fix in FilterMixin
    Toggle commit list
  • Czémán Arnold @cemiarni

    Added 18 commits:

    • c894c76d...56975960 - 17 commits from branch master
    • ca15148f - Merge branch 'master' into issue_458
    Sep 12, 2016

    Added 18 commits:

    • c894c76d...56975960 - 17 commits from branch master
    • ca15148f - Merge branch 'master' into issue_458
    Added 18 commits: * c894c76d...56975960 - 17 commits from branch `master` * ca15148f - Merge branch 'master' into issue_458
    Toggle commit list
  • Kálmán Viktor @kviktor

    mentioned in commit c177b3e8

    Oct 05, 2016

    mentioned in commit c177b3e8

    mentioned in commit c177b3e80cc2d277c67fb5b942818c61ebc25883
    Toggle commit list
  • Kálmán Viktor @kviktor

    Status changed to merged

    Oct 05, 2016

    Status changed to merged

    Status changed to merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: circle/cloud!387
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.