Mercurial > farol > farol

comparison farol/document.py @ 129:d2588d88d47a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move parseVersion flashing one level higher
author Benoît Allard <benoit.allard@greenbone.net>
date Fri, 24 Oct 2014 10:52:04 +0200
parents d49c1ee6bc07
children 812e613cbbb4
comparison
equal deleted inserted replaced
128:79abdecb2d0b 129:d2588d88d47a
85 tracking._identification._id = request.form['id'] 85 tracking._identification._id = request.form['id']
86 aliases = split_fields(request.form['id_aliases']) 86 aliases = split_fields(request.form['id_aliases'])
87 tracking._identification._aliases = aliases 87 tracking._identification._aliases = aliases
88 tracking._status = request.form['status'] 88 tracking._status = request.form['status']
89 version = parseVersion(request.form['version']) 89 version = parseVersion(request.form['version'])
90 if version is None: 90 if version is not None:
91 flash('Cannot parse Version field: "%s"' % request.form['version'], 'warning')
92 else:
93 tracking._version = version 91 tracking._version = version
94 tracking._initialDate = parseDate(request.form['initial']) 92 tracking._initialDate = parseDate(request.form['initial'])
95 tracking._currentDate = parseDate(request.form['current']) 93 tracking._currentDate = parseDate(request.form['current'])
96 if wasNone: 94 if wasNone:
97 get_current().setTracking(tracking) 95 get_current().setTracking(tracking)
118 abort(404) 116 abort(404)
119 if request.method != 'POST': 117 if request.method != 'POST':
120 return render_template('document/edit_revision.j2', number='.'.join('%s'%v for v in revision._number), date=revision._date, description=revision._description, action='Update') 118 return render_template('document/edit_revision.j2', number='.'.join('%s'%v for v in revision._number), date=revision._date, description=revision._description, action='Update')
121 119
122 version = parseVersion(request.form['number']) 120 version = parseVersion(request.form['number'])
123 if version is None: 121 if version is not None:
124 flash('Cannot parse Revision Number: %s' % request.form['number'])
125 else:
126 revision._number = version 122 revision._number = version
127 revision._date = parseDate(request.form['date']) 123 revision._date = parseDate(request.form['date'])
128 revision._description = request.form['description'] 124 revision._description = request.form['description']
129 return redirect(url_for('.view')) 125 return redirect(url_for('.view'))
130 126
138 return redirect(url_for('.edit_tracking')) 134 return redirect(url_for('.edit_tracking'))
139 version = tracking._version 135 version = tracking._version
140 version = version[:-1] + (version[-1] + 1,) 136 version = version[:-1] + (version[-1] + 1,)
141 return render_template('document/edit_revision.j2', number='.'.join("%d"%v for v in version), date=utcnow(), action='Add') 137 return render_template('document/edit_revision.j2', number='.'.join("%d"%v for v in version), date=utcnow(), action='Add')
142 138
143 version = parseVersion(request.form['number']) 139 version = parseVersion(request.form['number']) or (0,0)
144 if version is None:
145 flash('Cannot parse Revision Number: "%s", assuming "0.0"' % request.form['number'])
146 version = (0,0)
147 date = parseDate(request.form['date']) 140 date = parseDate(request.form['date'])
148 revision = CVRFRevision(version, date, request.form['description']) 141 revision = CVRFRevision(version, date, request.form['description'])
149 tracking.addRevision(revision) 142 tracking.addRevision(revision)
150 if 'update_tracking' in request.form: 143 if 'update_tracking' in request.form:
151 tracking._version = version 144 tracking._version = version
http://farol.wald.intevation.org