Revision 42732c26
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
881 | 881 |
def save(self, commit=True): |
882 | 882 |
data = dict(self.cleaned_data) |
883 | 883 |
data['precursor_application'] = self.instance.id |
884 |
data['owner'] = self.user |
|
884 |
is_new = self.instance.id is None |
|
885 |
data['owner'] = self.user if is_new else self.instance.owner |
|
885 | 886 |
data['resource_policies'] = self.resource_policies |
886 | 887 |
submit_application(data, request_user=self.user) |
887 | 888 |
|
b/snf-astakos-app/astakos/im/management/commands/project-list.py | ||
---|---|---|
133 | 133 |
self.show(csv, allow_shorten, chain_dict) |
134 | 134 |
|
135 | 135 |
def show(self, csv, allow_shorten, chain_dict): |
136 |
labels = ('ProjID', 'Name', 'Applicant', 'Email', 'Status', 'AppID')
|
|
136 |
labels = ('ProjID', 'Name', 'Owner', 'Email', 'Status', 'AppID')
|
|
137 | 137 |
columns = (7, 23, 20, 20, 17, 7) |
138 | 138 |
|
139 | 139 |
if not csv: |
... | ... | |
147 | 147 |
fields = [ |
148 | 148 |
(info['projectid'], False), |
149 | 149 |
(info['name'], True), |
150 |
(info['applicant'], True),
|
|
150 |
(info['owner'], True),
|
|
151 | 151 |
(info['email'], True), |
152 | 152 |
(info['status'], False), |
153 | 153 |
(info['appid'], False), |
... | ... | |
190 | 190 |
d = { |
191 | 191 |
'projectid': str(chain), |
192 | 192 |
'name': project.application.name if project else app.name, |
193 |
'applicant': app.applicant.realname,
|
|
194 |
'email': app.applicant.email,
|
|
193 |
'owner': app.owner.realname,
|
|
194 |
'email': app.owner.email,
|
|
195 | 195 |
'status': status, |
196 | 196 |
'appid': appid, |
197 | 197 |
} |
Also available in: Unified diff