@@ -70,48 +70,48 @@ def insert_object(self):
70
70
class ProgramOwnerColumnHandler (ObjectRoleColumnHandler ):
71
71
72
72
def __init__ (self , row_converter , key , ** options ):
73
- self .role = Role . query . filter_by ( name = "ProgramOwner" ). one ( )
73
+ self .role = row_converter . block_converter . get_role ( "ProgramOwner" )
74
74
super (ProgramOwnerColumnHandler , self ).__init__ (
75
75
row_converter , key , ** options )
76
76
77
77
78
78
class ProgramEditorColumnHandler (ObjectRoleColumnHandler ):
79
79
80
80
def __init__ (self , row_converter , key , ** options ):
81
- self .role = Role . query . filter_by ( name = "ProgramEditor" ). one ( )
81
+ self .role = row_converter . block_converter . get_role ( "ProgramEditor" )
82
82
super (ProgramEditorColumnHandler , self ).__init__ (
83
83
row_converter , key , ** options )
84
84
85
85
86
86
class ProgramReaderColumnHandler (ObjectRoleColumnHandler ):
87
87
88
88
def __init__ (self , row_converter , key , ** options ):
89
- self .role = Role . query . filter_by ( name = "ProgramReader" ). one ( )
89
+ self .role = row_converter . block_converter . get_role ( "ProgramReader" )
90
90
super (ProgramReaderColumnHandler , self ).__init__ (
91
91
row_converter , key , ** options )
92
92
93
93
94
94
class WorkflowOwnerColumnHandler (ObjectRoleColumnHandler ):
95
95
96
96
def __init__ (self , row_converter , key , ** options ):
97
- self .role = Role . query . filter_by ( name = "WorkflowOwner" ). one ( )
97
+ self .role = row_converter . block_converter . get_role ( "WorkflowOwner" )
98
98
super (WorkflowOwnerColumnHandler , self ).__init__ (
99
99
row_converter , key , ** options )
100
100
101
101
102
102
class WorkflowMemberColumnHandler (ObjectRoleColumnHandler ):
103
103
104
104
def __init__ (self , row_converter , key , ** options ):
105
- self .role = Role . query . filter_by ( name = "WorkflowMember" ). one ( )
105
+ self .role = row_converter . block_converter . get_role ( "WorkflowMember" )
106
106
super (WorkflowMemberColumnHandler , self ).__init__ (
107
107
row_converter , key , ** options )
108
108
109
109
110
110
class AuditAuditorColumnHandler (ObjectRoleColumnHandler ):
111
111
112
112
def __init__ (self , row_converter , key , ** options ):
113
- self .role = Role . query . filter_by ( name = "Auditor" ). one ( )
114
- self .reader = Role . query . filter_by ( name = "ProgramReader" ). one ( )
113
+ self .role = row_converter . block_converter . get_role ( "Auditor" )
114
+ self .reader = row_converter . block_converter . get_role ( "ProgramReader" )
115
115
super (AuditAuditorColumnHandler , self ).__init__ (
116
116
row_converter , key , ** options )
117
117
@@ -192,6 +192,7 @@ def insert_object(self):
192
192
db .session .add (user_role )
193
193
self .dry_run = True
194
194
195
+
195
196
COLUMN_HANDLERS = {
196
197
"default" : {
197
198
"program_editor" : ProgramEditorColumnHandler ,
0 commit comments