Merge lp:~romaia/stoq/user-view into lp:~stoq-dev/stoq/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
=== modified file 'stoq/gui/admin/admin.py'
--- stoq/gui/admin/admin.py 2009-02-13 17:56:49 +0000
+++ stoq/gui/admin/admin.py 2009-08-11 19:36:27 +0000
@@ -35,7 +35,7 @@
35from stoqlib.database.orm import AND35from stoqlib.database.orm import AND
36from stoqlib.database.runtime import (new_transaction, finish_transaction,36from stoqlib.database.runtime import (new_transaction, finish_transaction,
37 get_current_branch)37 get_current_branch)
38from stoqlib.domain.person import Person, PersonAdaptToUser38from stoqlib.domain.person import Person, PersonAdaptToUser, UserView
39from stoqlib.domain.profile import UserProfile39from stoqlib.domain.profile import UserProfile
40from stoqlib.domain.invoice import InvoiceLayout40from stoqlib.domain.invoice import InvoiceLayout
41from stoqlib.gui.base.columns import ForeignKeyColumn41from stoqlib.gui.base.columns import ForeignKeyColumn
@@ -68,7 +68,7 @@
68 app_name = _('Administrative')68 app_name = _('Administrative')
69 app_icon_name = 'stoq-admin-app'69 app_icon_name = 'stoq-admin-app'
70 gladefile = "admin"70 gladefile = "admin"
71 search_table = PersonAdaptToUser71 search_table = UserView
72 search_label = _('matching:')72 search_label = _('matching:')
7373
74 def __init__(self, app):74 def __init__(self, app):
@@ -87,13 +87,11 @@
87 def get_columns(self):87 def get_columns(self):
88 return [SearchColumn('username', title=_('Login Name'), sorted=True,88 return [SearchColumn('username', title=_('Login Name'), sorted=True,
89 data_type=str, width=150, searchable=True),89 data_type=str, width=150, searchable=True),
90 ForeignKeyColumn(UserProfile, 'name', title=_('Profile'),90 SearchColumn('profile_name', title=_('Profile'),
91 obj_field='profile', data_type=str,91 data_type=str, width=150, expand=True,
92 width=150, expand=True,92 ellipsize=pango.ELLIPSIZE_END),
93 ellipsize=pango.ELLIPSIZE_END),93 SearchColumn('name', title=_('Name'), data_type=str,
94 ForeignKeyColumn(Person, 'name', title=_('Name'),94 width=300),
95 data_type=str, adapted=True,
96 width=300),
97 Column('status_str', title=_('Status'), data_type=str)]95 Column('status_str', title=_('Status'), data_type=str)]
9896
99 #97 #
@@ -106,12 +104,11 @@
106 return items104 return items
107105
108 def _get_status_query(self, state):106 def _get_status_query(self, state):
109 query = AND(PersonAdaptToUser.q._originalID == Person.q.id,107 query = None
110 UserProfile.q.id == PersonAdaptToUser.q.profileID)
111 if state.value == PersonAdaptToUser.STATUS_ACTIVE:108 if state.value == PersonAdaptToUser.STATUS_ACTIVE:
112 query = AND(query, PersonAdaptToUser.q.is_active == True)109 query = PersonAdaptToUser.q.is_active == True
113 elif state.value == PersonAdaptToUser.STATUS_INACTIVE:110 elif state.value == PersonAdaptToUser.STATUS_INACTIVE:
114 query = AND(query, PersonAdaptToUser.q.is_active == False)111 query = PersonAdaptToUser.q.is_active == False
115112
116 return query113 return query
117114
@@ -121,7 +118,7 @@
121118
122 def _edit_user(self):119 def _edit_user(self):
123 trans = new_transaction()120 trans = new_transaction()
124 user = trans.get(self.results.get_selected())121 user = trans.get(self.results.get_selected().user)
125 model = run_person_role_dialog(UserEditor, self, trans, user)122 model = run_person_role_dialog(UserEditor, self, trans, user)
126 finish_transaction(trans, model)123 finish_transaction(trans, model)
127 trans.close()124 trans.close()

Subscribers

People subscribed via source and target branches