[copr] master: fix pagination (fbbb323)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit fbbb323de69ffd2c9afa70e7c697be8679f19a37
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 7 14:55:59 2013 +0100
fix pagination
we want to paginate by every 10 mock
With with_mock_chroots=True it will paginate every 10/(number-of-chroots-in-project),
which can be even 2, which is ugly and unuseful.
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 41c5a24..e3030ea 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -21,7 +21,7 @@ from coprs.logic import coprs_logic
@coprs_ns.route('/', defaults = {'page': 1})
@coprs_ns.route('/<int:page>/')
def coprs_show(page=1):
- query = coprs_logic.CoprsLogic.get_multiple(flask.g.user, with_mock_chroots=True)
+ query = coprs_logic.CoprsLogic.get_multiple(flask.g.user, with_mock_chroots=False)
paginator = helpers.Paginator(query, query.count(), page)
coprs = paginator.sliced_query
@@ -34,7 +34,7 @@ def coprs_by_owner(username=None, page=1):
query = coprs_logic.CoprsLogic.get_multiple(flask.g.user,
user_relation='owned',
username=username,
- with_mock_chroots=True)
+ with_mock_chroots=False)
paginator = helpers.Paginator(query, query.count(), page)
coprs = paginator.sliced_query
@@ -47,7 +47,7 @@ def coprs_by_allowed(username=None, page=1):
query = coprs_logic.CoprsLogic.get_multiple(flask.g.user,
user_relation='allowed',
username=username,
- with_mock_chroots=True)
+ with_mock_chroots=False)
paginator = helpers.Paginator(query, query.count(), page)
coprs = paginator.sliced_query
10 years, 7 months
[copr] master: fix one failing test (540ef99)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 540ef995ac71c34d4c957d1a3f5cc60c92956b34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Nov 7 09:33:20 2013 +0100
fix one failing test
>---------------------------------------------------------------
copr.spec | 2 +-
.../test_views/test_coprs_ns/test_coprs_general.py | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index 6253d99..ed28b07 100644
--- a/copr.spec
+++ b/copr.spec
@@ -264,7 +264,7 @@ pushd coprs_frontend
TMPFILE=$(mktemp)
COPR_CONFIG="$(pwd)/config/copr_unit_test.conf" ./manage.py test | tee $TMPFILE
# remove this when tests are fixed
-grep "2 failed, 64 passed" $TMPFILE
+grep "1 failed, 65 passed" $TMPFILE
popd
%pre backend
diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index 98278a2..e02a0b3 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -400,6 +400,14 @@ class TestCoprRepoGeneration(CoprsTestCase):
self.cc1 = self.models.CoprChroot(mock_chroot = self.mc1, copr = self.c1)
self.db.session.add_all([self.b5, self.b6, self.b7, self.mc1, self.cc1])
+ @pytest.fixture
+ def f_not_finished_builds(self):
+ ''' Custom builds are used in order not to break the default ones '''
+ self.b8 = self.models.Build(copr=self.c1, user=self.u1, chroots='fedora-18-x86_64', submitted_on=11)
+ self.mc1 = self.models.MockChroot(os_release='fedora', os_version='18', arch='x86_64')
+ self.cc1 = self.models.CoprChroot(mock_chroot = self.mc1, copr = self.c1)
+ self.db.session.add_all([self.b8, self.mc1, self.cc1])
+
def test_fail_on_missing_dash(self):
r = self.tc.get('/coprs/reponamewithoutdash/repo/')
assert r.status_code == 404
@@ -410,7 +418,7 @@ class TestCoprRepoGeneration(CoprsTestCase):
assert r.status_code == 404
assert 'does not exist' in r.data
- def test_fail_on_no_finished_builds(self, f_users, f_coprs, f_db):
+ def test_fail_on_no_finished_builds(self, f_users, f_coprs, f_not_finished_builds, f_db):
r = self.tc.get(
'/coprs/{0}/{1}/repo/fedora-18-x86_64/'.format(self.u1.name, self.c1.name))
assert r.status_code == 404
10 years, 7 months
[copr] master: Automatic commit of package [copr] release [1.13-1]. (46bcbee)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 46bcbeecdf50fb72a25f2867c8a203f26c06cc1e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 21:18:42 2013 +0100
Automatic commit of package [copr] release [1.13-1].
>---------------------------------------------------------------
copr.spec | 15 ++++++++++++++-
rel-eng/packages/copr | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index 3151467..6253d99 100644
--- a/copr.spec
+++ b/copr.spec
@@ -5,7 +5,7 @@
%global modulename copr
Name: copr
-Version: 1.12
+Version: 1.13
Release: 1%{?dist}
Summary: Cool Other Package Repo
@@ -380,6 +380,19 @@ fi
%{_mandir}/man8/%{name}-selinux-relabel.8*
%changelog
+* Wed Nov 06 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.13-1
+- suggest correct name of repo file
+- we could not use releasever macro
+- no need to capitalize Projects
+- another s/copr/project
+- add link to header for sign-in
+- fix failing tests
+- UX - let textarea will full widht of box
+- UX - make background of hovered builds darker
+- generate yum repo for each chroot of copr
+- align table header same way as ordinary rows
+- enable resulting repo and disable gpgchecks
+
* Mon Nov 04 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.12-1
- do not send parameters when we neither need them nor use them
- authenticate using api login, not using username
diff --git a/rel-eng/packages/copr b/rel-eng/packages/copr
index 132a6e1..1a5ddc2 100644
--- a/rel-eng/packages/copr
+++ b/rel-eng/packages/copr
@@ -1 +1 @@
-1.12-1 ./
+1.13-1 ./
10 years, 7 months
[copr] master: suggest correct name of repo file (9b064e3)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 9b064e31baf7393939069b74d00cc30e86d55811
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 21:17:36 2013 +0100
suggest correct name of repo file
when saving. otherwise client will use name index.htm
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 61f76d7..41c5a24 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -324,4 +324,5 @@ def generate_repo_file(username, coprname, chroot):
response = flask.make_response(flask.render_template('coprs/copr.repo', copr=copr, url=url))
response.mimetype='text/plain'
+ response.headers['Content-Disposition'] = 'filename=%s.repo' % reponame
return response
10 years, 7 months
[copr] master: we could not use releasever macro (a3d332a)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit a3d332a92db15733865b22caf509389820c48058
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 21:07:14 2013 +0100
we could not use releasever macro
because especially on rhel this could be anything:
6 on CentOS. 6Server, 6Client on RHEL...
>---------------------------------------------------------------
.../coprs/views/coprs_ns/coprs_general.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
index 0102b09..61f76d7 100644
--- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
+++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py
@@ -320,7 +320,7 @@ def generate_repo_file(username, coprname, chroot):
if not url:
return page_not_found('Repository not initialized: No finished builds in {0}/{1}.'.format(username, coprname))
- url = urlparse.urljoin(url, "%s-%s-%s/" % (mock_chroot.os_release, '$releasever', '$basearch'))
+ url = urlparse.urljoin(url, "%s-%s-%s/" % (mock_chroot.os_release, mock_chroot.os_version, '$basearch'))
response = flask.make_response(flask.render_template('coprs/copr.repo', copr=copr, url=url))
response.mimetype='text/plain'
10 years, 7 months
[copr] master: project name is required, send it but does not allow modification (dc3aafa)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit dc3aafac85d34e8ce71757ce7593f7eef47d7ca2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 20:29:40 2013 +0100
project name is required, send it but does not allow modification
>---------------------------------------------------------------
.../coprs/templates/coprs/_coprs_forms.html | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
index f4bd7cf..582638a 100644
--- a/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
+++ b/coprs_frontend/coprs/templates/coprs/_coprs_forms.html
@@ -15,6 +15,7 @@
{% if copr is none %}
{{ render_field(form.name, label='Project Name', required = True, class="required") }}
{% else %}
+ {{ render_field(form.name, hidden = True) }}
{{ render_field(form.name, label='Project Name', disabled = True) }}
{% endif %}
{{ render_field(form.description, rows=5, cols=50, placeholder='Optional - describe your project briefly.') }}
10 years, 7 months
[copr] master: no need to capitalize Projects (090572c)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 090572cb232c02197f1dea5ddfcb9f796761fc0c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 14:48:47 2013 +0100
no need to capitalize Projects
>---------------------------------------------------------------
coprs_frontend/coprs/templates/coprs/show.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index 1284f06..833d19d 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -19,7 +19,7 @@
{% if g.user %}
<div class="add-copr">+
<a href={{ url_for('coprs_ns.copr_add', username=g.user.name) }}>
- add a new Project
+ add a new project
</a>
</div>
{% endif %}
10 years, 7 months
[copr] master: another s/copr/project (d619b19)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d619b19c16a454c111398a8a2db80be3604dc777
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 14:48:04 2013 +0100
another s/copr/project
>---------------------------------------------------------------
coprs_frontend/coprs/templates/coprs/show.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index d198d2d..1284f06 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -1,6 +1,6 @@
{% extends "layout.html" %}
-{% block title %}Coprs List{% endblock %}
-{% block header %}Coprs List{% endblock %}
+{% block title %}Project List{% endblock %}
+{% block header %}Project List{% endblock %}
{% from "_helpers.html" import render_pagination %}
{% block body %}
{% if g.user %}
@@ -12,7 +12,7 @@
<p class="coprs-count">
<a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Projects">{{ g.user.coprs_count }}</a>
</p>
- <p class="other-text">coprs</p>
+ <p class="other-text">projects</p>
</div>
{% endif %}
<div class="coprs-list-{% if g.user %}thin{% else %}thick{% endif %}">
10 years, 7 months
[copr] master: add link to header for sign-in (4f1cb09)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4f1cb0976d80f756c33af10e9c212d9ecad3c36f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Nov 6 10:51:26 2013 +0100
add link to header for sign-in
>---------------------------------------------------------------
coprs_frontend/coprs/templates/layout.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs/templates/layout.html b/coprs_frontend/coprs/templates/layout.html
index 982fdb7..465103e 100644
--- a/coprs_frontend/coprs/templates/layout.html
+++ b/coprs_frontend/coprs/templates/layout.html
@@ -14,7 +14,7 @@
{% if g.user %}
<div><span class="text">logged in as </span>{{ g.user.name }} | <a href="{{ url_for('misc.logout') }}">log out</a></div>
{% else %}
- <div><a href="{{ url_for('misc.login') }}">log in</a></div>
+ <div><a href="{{ url_for('misc.login') }}">log in</a> | <a href="https://admin.fedoraproject.org/accounts/user/new">sign up</a></div>
{% endif %}
<form method="get" action="{{ url_for('coprs_ns.coprs_fulltext_search') }}">
<input class="rounded" type="text" name="fulltext">
10 years, 7 months