Skip to content

Commit

Permalink
Update the web app to use the single FMN version
Browse files Browse the repository at this point in the history
This is necessary since there are no longer fmn.web, fmn.lib, or
fmn.rules distributions.

Signed-off-by: Jeremy Cline <jeremy@jcline.org>
  • Loading branch information
jeremycline committed Apr 26, 2017
1 parent cb3994f commit 15492f9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
8 changes: 2 additions & 6 deletions fmn/web/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,13 @@ def inject_variable():
logged_in_user = flask.g.auth.openid
contexts = fmn.lib.models.Context.all(SESSION)

web_version = get_distribution('fmn.web').version
lib_version = get_distribution('fmn.lib').version
rules_version = get_distribution('fmn.rules').version
fmn_version = get_distribution('fmn').version

return dict(openid=openid,
contexts=contexts,
valid_paths=valid_paths,
rule_types=rule_types,
web_version=web_version,
lib_version=lib_version,
rules_version=rules_version)
fmn_version=fmn_version)


@app.route('/_heartbeat')
Expand Down
4 changes: 1 addition & 3 deletions fmn/web/templates/master.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,7 @@
©2013-2015 Red Hat, Inc., <a href="http://threebean.org">Ralph Bean</a>.
</p>
<p class="text-muted">
Running <code>fmn.web-{{web_version}}</code>,
<code>fmn.lib-{{lib_version}}</code>, and
<code>fmn.rules-{{rules_version}}</code>.
Running <code>fmn-{{fmn_version}}</code>.
</p>
</div>
</div>
Expand Down

0 comments on commit 15492f9

Please sign in to comment.