Stoq

Merge lp:~romaia/stoq/user-view into lp:~stoq-dev/stoq/master-old

  1. user-view
  2. Merge into master-old
Proposed by Ronaldo Maia
Status: Merged
Merged at revision: not available
Proposed branch: lp:~romaia/stoq/user-view
Merge into: lp:~stoq-dev/stoq/master-old
Diff against target: None lines
To merge this branch: bzr merge lp:~romaia/stoq/user-view
Reviewer Review Type Date Requested Status
George Kussumoto (community) code Approve
Review via email: mp+9996@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ronaldo Maia (romaia) wrote :

Usando uma visão para exibir os usuários no aplicativo admin.

Revision history for this message
George Kussumoto (georgeyk) :
review: Approve (code)
lp:~romaia/stoq/user-view updated
1580. By Ronaldo Maia

remove unecessary import

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stoq/gui/admin/admin.py'
2--- stoq/gui/admin/admin.py 2009-02-13 17:56:49 +0000
3+++ stoq/gui/admin/admin.py 2009-08-11 19:36:27 +0000
4@@ -35,7 +35,7 @@
5 from stoqlib.database.orm import AND
6 from stoqlib.database.runtime import (new_transaction, finish_transaction,
7 get_current_branch)
8-from stoqlib.domain.person import Person, PersonAdaptToUser
9+from stoqlib.domain.person import Person, PersonAdaptToUser, UserView
10 from stoqlib.domain.profile import UserProfile
11 from stoqlib.domain.invoice import InvoiceLayout
12 from stoqlib.gui.base.columns import ForeignKeyColumn
13@@ -68,7 +68,7 @@
14 app_name = _('Administrative')
15 app_icon_name = 'stoq-admin-app'
16 gladefile = "admin"
17- search_table = PersonAdaptToUser
18+ search_table = UserView
19 search_label = _('matching:')
20
21 def __init__(self, app):
22@@ -87,13 +87,11 @@
23 def get_columns(self):
24 return [SearchColumn('username', title=_('Login Name'), sorted=True,
25 data_type=str, width=150, searchable=True),
26- ForeignKeyColumn(UserProfile, 'name', title=_('Profile'),
27- obj_field='profile', data_type=str,
28- width=150, expand=True,
29- ellipsize=pango.ELLIPSIZE_END),
30- ForeignKeyColumn(Person, 'name', title=_('Name'),
31- data_type=str, adapted=True,
32- width=300),
33+ SearchColumn('profile_name', title=_('Profile'),
34+ data_type=str, width=150, expand=True,
35+ ellipsize=pango.ELLIPSIZE_END),
36+ SearchColumn('name', title=_('Name'), data_type=str,
37+ width=300),
38 Column('status_str', title=_('Status'), data_type=str)]
39
40 #
41@@ -106,12 +104,11 @@
42 return items
43
44 def _get_status_query(self, state):
45- query = AND(PersonAdaptToUser.q._originalID == Person.q.id,
46- UserProfile.q.id == PersonAdaptToUser.q.profileID)
47+ query = None
48 if state.value == PersonAdaptToUser.STATUS_ACTIVE:
49- query = AND(query, PersonAdaptToUser.q.is_active == True)
50+ query = PersonAdaptToUser.q.is_active == True
51 elif state.value == PersonAdaptToUser.STATUS_INACTIVE:
52- query = AND(query, PersonAdaptToUser.q.is_active == False)
53+ query = PersonAdaptToUser.q.is_active == False
54
55 return query
56
57@@ -121,7 +118,7 @@
58
59 def _edit_user(self):
60 trans = new_transaction()
61- user = trans.get(self.results.get_selected())
62+ user = trans.get(self.results.get_selected().user)
63 model = run_person_role_dialog(UserEditor, self, trans, user)
64 finish_transaction(trans, model)
65 trans.close()

Subscribers

People subscribed via source and target branches