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 !286 opened Jan 16, 2015 by Bach Dániel@bachdaniel 
  • Report abuse
Report abuse

Useradmin ✅

Closes #372 (closed)

  • Discussion 2
  • Commits 11
  • Changes
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Bach Dániel @bachdaniel

    Added 27 new commits:

    • f4df866a - dashboard: warn user about missing traits on migrate/deploy
    • 7c5eae88 - dashboard: node/trait fix
    • 921944e9 - Merge branch 'master' into issue-291
    • 10adcce0 - update requirements
    • cafadff8 - circle: update settings
    • 80695e1f - vm: fix saving vms as templates with deleted parent
    • ebdf3b7e - dashboard: fix disk remove missing method
    • 1e26bc6e - dashboard: trivial fixes
    • 668c2659 - common: fix HumanSortField
    • e9b63096 - circle: fix tests
    • 73844bcc - circle: add new migrations
    • 37c1c52d - vm: fix migration dependencies
    • aed286e6 - dashboard: migrate form fields
    • c4cd703c - firewall: add migration
    • bb4dfc17 - dashboard: group rename without js
    • acfa3715 - Merge branch 'issue-291' into 'master'
    • bd898707 - Merge branch 'feature-group-rename' into 'master'
    • f47965c1 - dashboard: fix jshint warnings
    • c5f2291b - Merge branch 'master' into feature-jshint
    • f8759446 - update requirements.txt
    • 892f1470 - Merge branch 'feature-jshint' into 'master'
    • 3d40e5f4 - Merge branch 'feature-django-1.7'
    • dd51b502 - network: fix flake8 warning
    • 07195cac - Revert "update requirements.txt"
    • 30d8fe06 - network: order hosts by noramlized hostname
    • e9ee55cc - dashboard: add user list view
    • eb103640 - dashboard: rewrite search js
    Jan 21, 2015

    Added 27 new commits:

    • f4df866a - dashboard: warn user about missing traits on migrate/deploy
    • 7c5eae88 - dashboard: node/trait fix
    • 921944e9 - Merge branch 'master' into issue-291
    • 10adcce0 - update requirements
    • cafadff8 - circle: update settings
    • 80695e1f - vm: fix saving vms as templates with deleted parent
    • ebdf3b7e - dashboard: fix disk remove missing method
    • 1e26bc6e - dashboard: trivial fixes
    • 668c2659 - common: fix HumanSortField
    • e9b63096 - circle: fix tests
    • 73844bcc - circle: add new migrations
    • 37c1c52d - vm: fix migration dependencies
    • aed286e6 - dashboard: migrate form fields
    • c4cd703c - firewall: add migration
    • bb4dfc17 - dashboard: group rename without js
    • acfa3715 - Merge branch 'issue-291' into 'master'
    • bd898707 - Merge branch 'feature-group-rename' into 'master'
    • f47965c1 - dashboard: fix jshint warnings
    • c5f2291b - Merge branch 'master' into feature-jshint
    • f8759446 - update requirements.txt
    • 892f1470 - Merge branch 'feature-jshint' into 'master'
    • 3d40e5f4 - Merge branch 'feature-django-1.7'
    • dd51b502 - network: fix flake8 warning
    • 07195cac - Revert "update requirements.txt"
    • 30d8fe06 - network: order hosts by noramlized hostname
    • e9ee55cc - dashboard: add user list view
    • eb103640 - dashboard: rewrite search js
    Added 27 new commits: * f4df866a926 - dashboard: warn user about missing traits on migrate/deploy * 7c5eae8897f - dashboard: node/trait fix * 921944e9677 - Merge branch 'master' into issue-291 * 10adcce0ef9 - update requirements * cafadff8f41 - circle: update settings * 80695e1fe9c - vm: fix saving vms as templates with deleted parent * ebdf3b7ebb1 - dashboard: fix disk remove missing method * 1e26bc6e0ed - dashboard: trivial fixes * 668c2659a5c - common: fix HumanSortField * e9b63096a52 - circle: fix tests * 73844bccfc8 - circle: add new migrations * 37c1c52d72d - vm: fix migration dependencies * aed286e6532 - dashboard: migrate form fields * c4cd703c3bf - firewall: add migration * bb4dfc17d6c - dashboard: group rename without js * acfa37159f4 - Merge branch 'issue-291' into 'master' * bd898707a34 - Merge branch 'feature-group-rename' into 'master' * f47965c1921 - dashboard: fix jshint warnings * c5f2291be36 - Merge branch 'master' into feature-jshint * f8759446e38 - update requirements.txt * 892f1470529 - Merge branch 'feature-jshint' into 'master' * 3d40e5f4249 - Merge branch 'feature-django-1.7' * dd51b5023bc - network: fix flake8 warning * 07195cac985 - Revert "update requirements.txt" * 30d8fe06fcc - network: order hosts by noramlized hostname * e9ee55cc03f - dashboard: add user list view * eb10364070f - dashboard: rewrite search js
    Toggle commit list
  • Bach Dániel @bachdaniel

    Added 6 new commits:

    • 073496de - dashboard: fix race condition in search js
    • 47ecf19c - dashboard: fix jshint error
    • 0df9f5df - dashboard: add template search func
    • 18d3d7d9 - dashboard: rewrite UserCreationView
    • b0123844 - dashboard: add UserEditForm
    • 8d1803e4 - locale: update hu translation
    Jan 21, 2015

    Added 6 new commits:

    • 073496de - dashboard: fix race condition in search js
    • 47ecf19c - dashboard: fix jshint error
    • 0df9f5df - dashboard: add template search func
    • 18d3d7d9 - dashboard: rewrite UserCreationView
    • b0123844 - dashboard: add UserEditForm
    • 8d1803e4 - locale: update hu translation
    Added 6 new commits: * 073496de0fa - dashboard: fix race condition in search js * 47ecf19c5ec - dashboard: fix jshint error * 0df9f5df843 - dashboard: add template search func * 18d3d7d9483 - dashboard: rewrite UserCreationView * b01238441ba - dashboard: add UserEditForm * 8d1803e4d15 - locale: update hu translation
    Toggle commit list
  • Bach Dániel @bachdaniel

    Added 1 new commit:

    • 20dd2231 - dashboard: fix tests
    Jan 21, 2015

    Added 1 new commit:

    • 20dd2231 - dashboard: fix tests
    Added 1 new commit: * 20dd223133f - dashboard: fix tests
    Toggle commit list
  • Kálmán Viktor @kviktor

    Added 1 new commit:

    • 3ce61935 - dashboard: fix copypaste errors
    Jan 26, 2015

    Added 1 new commit:

    • 3ce61935 - dashboard: fix copypaste errors
    Added 1 new commit: * 3ce61935a5a - dashboard: fix copypaste errors
    Toggle commit list
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Jan 26, 2015
    circle/dashboard/templates/dashboard/user-list.html
    18 </div>
    19 <div class="panel-body">
    20 <div class="row">
    21 <div class="col-md-offset-8 col-md-4" id="template-list-search">
    22 <form action="" method="GET">
    23 <div class="input-group">
    24 {{ search_form.s }}
    25 <div class="input-group-btn">
    26 {{ search_form.stype }}
    27 <button type="submit" class="btn btn-primary input-tags">
    28 <i class="fa fa-search"></i>
    29 </button>
    30 </div>
    31 </div><!-- .input-group -->
    32 </form>
    33 </div><!-- .col-md-4 #template-list-search -->
    • Kálmán Viktor @kviktor commented Jan 26, 2015
      Owner

      :trollface:

      :trollface:
    Please register or sign in to reply
  • Kálmán Viktor
    @kviktor started a discussion on an old version of the diff Jan 26, 2015
    circle/dashboard/views/user.py
    524 self.search_form.full_clean()
    525
    526 if self.request.is_ajax():
    527 users = [
    528 {'url': reverse("dashboard.views.profile", args=[i.username]),
    529 'name': i.get_full_name() or i.username}
    530 for i in self.get_queryset()]
    531 return HttpResponse(
    532 json.dumps(users), content_type="application/json")
    533 else:
    534 return super(UserList, self).get(*args, **kwargs)
    535
    536 def get_queryset(self):
    537 logger.debug('UserList.get_queryset() called. User: %s',
    538 unicode(self.request.user))
    539 qs = User.objects.all()
    • Kálmán Viktor @kviktor commented Jan 26, 2015
      Owner

      order by pk?

      order by pk?
    Please register or sign in to reply
  • Kálmán Viktor @kviktor

    Added 1 new commit:

    • ca4fcef5 - dashboard: user list features
    Jan 29, 2015

    Added 1 new commit:

    • ca4fcef5 - dashboard: user list features
    Added 1 new commit: * ca4fcef5009 - dashboard: user list features
    Toggle commit list
  • Kálmán Viktor @kviktor

    mentioned in commit 1e514d5b

    Feb 06, 2015

    mentioned in commit 1e514d5b

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

    Status changed to merged

    Feb 06, 2015

    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
Bach Dániel
Assignee
Bach Dániel @bachdaniel
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: circle/cloud!286