Misc fixes

This commit is contained in:
Alexandre Aubin 2018-11-08 13:16:07 +00:00
parent 905ee51e6d
commit 093e61f136
4 changed files with 12 additions and 6 deletions

View file

@ -166,6 +166,9 @@ def app_maintainer_dash():
if test.branch.name == "stable": if test.branch.name == "stable":
app.ci_level = test.level app.ci_level = test.level
if isinstance(app.public_level, str):
app.public_level = -1
maintainers = sorted(maintainers, key=lambda m: m.lower()) maintainers = sorted(maintainers, key=lambda m: m.lower())
apps = sorted(apps, key=lambda app: app.name.lower()) apps = sorted(apps, key=lambda app: app.name.lower())

View file

@ -124,6 +124,7 @@ def make_rss_feed():
fe.title('Changes between %s and %s' % (diff["begin"].strftime("%b %d"), diff["end"].strftime("%b %d"))) fe.title('Changes between %s and %s' % (diff["begin"].strftime("%b %d"), diff["end"].strftime("%b %d")))
fe.link(href='https://github.com/YunoHost/apps/commits/master/community.json') fe.link(href='https://github.com/YunoHost/apps/commits/master/community.json')
fe.content(jinja2.Template(open("rss_template.html").read()).render(data=diff), type="html") fe.content(jinja2.Template(open("rss_template.html").read()).render(data=diff), type="html")
fe._FeedEntry__atom_updated = diff["end"]
fg.atom_file('atom.xml') fg.atom_file('atom.xml')
@ -157,6 +158,6 @@ def make_count_summary():
json.dump(history, open('count_history.json', 'w')) json.dump(history, open('count_history.json', 'w'))
#get_lists_history() get_lists_history()
make_rss_feed() make_rss_feed()
#make_count_summary() make_count_summary()

View file

@ -15,6 +15,7 @@ function createIssue()
--data "$DATA" ) --data "$DATA" )
#echo "$ANSWER" >&2 #echo "$ANSWER" >&2
echo "$ANSWER"
echo "$ANSWER" \ echo "$ANSWER" \
| grep "^ \"html_url\":" \ | grep "^ \"html_url\":" \
| awk '{print $2}' \ | awk '{print $2}' \
@ -31,6 +32,7 @@ function main()
while read -r line while read -r line
do do
echo $line
OWNER=$(echo "$line" | tr '/' ' ' | awk '{print $3}') OWNER=$(echo "$line" | tr '/' ' ' | awk '{print $3}')
REPO=$(echo "$line" | tr '/' ' ' | awk '{print $4}') REPO=$(echo "$line" | tr '/' ' ' | awk '{print $4}')
createIssue $OWNER $REPO createIssue $OWNER $REPO

View file

@ -83,7 +83,7 @@
table-success table-success
{% endif %} {% endif %}
" value="{{ app.public_level }}"> " value="{{ app.public_level }}">
<div title="Public Level"><strong>{{ app.public_level if app.public_level >= 0 else "?" }}</strong></div> <div title="Public Level"><strong>{{ app.public_level if app.public_level != None and app.public_level >= 0 else "?" }}</strong></div>
</td> </td>
@ -98,7 +98,7 @@
table-success table-success
{% endif %} {% endif %}
" value="{{ app.ci_level }}"> " value="{{ app.ci_level }}">
<div title="CI Level"><strong>{{ app.ci_level if app.ci_level and app.ci_level >= 0 else "?" }}</strong></div> <div title="CI Level"><strong>{{ app.ci_level if app.ci_level != None and app.ci_level >= 0 else "?" }}</strong></div>
</td> </td>
{% endif %} {% endif %}
@ -125,8 +125,8 @@
<td class="ci-app-test-info"> <td class="ci-app-test-info">
{% if app.public_commit_date %} {% if app.master_commit_date %}
<span class="daysAgo" timestamp={{ app.public_commit_date.timestamp() }}></span></td> <span class="daysAgo" timestamp={{ app.master_commit_date.timestamp() }}></span></td>
{% else %} {% else %}
<span class="daysAgo">???</span></td> <span class="daysAgo">???</span></td>
{% endif %} {% endif %}