Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
List overview
Download
copr-devel
April 2013
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
copr-devel@lists.stg.fedorahosted.org
6 participants
16 discussions
Start a n
N
ew thread
[copr] master: Handle situation where copr was deleted before admin reviewed its legal issues (4868d07)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit 4868d0756b5fdbc161b2189983df1e4f89a3f483 Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 13:38:32 2013 +0200 Handle situation where copr was deleted before admin reviewed its legal issues >--------------------------------------------------------------- .../coprs/views/admin_ns/admin_general.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/coprs_frontend/coprs/views/admin_ns/admin_general.py b/coprs_frontend/coprs/views/admin_ns/admin_general.py index e439809..c1b6146 100644 --- a/coprs_frontend/coprs/views/admin_ns/admin_general.py +++ b/coprs_frontend/coprs/views/admin_ns/admin_general.py @@ -27,7 +27,9 @@ def legal_flag(): # is not very good (and sqlalchemy complains about it) coprs = coprs_logic.CoprsLogic.get_multiple(flask.g.user, ids=ids).all() if ids else [] for flag in legal_flags: - flag.copr = filter(lambda x: flag.object_id == x.id, coprs)[0] + # handle the situation where copr was deleted in the meanwhile + copr = filter(lambda x: flag.object_id == x.id, coprs) + flag.copr = copr[0] if copr else None return flask.render_template('admin/legal-flag.html', legal_flags=legal_flags)
1
0
0
0
[copr] master: Only show the messages, don't hide them with JS, it is confusing (6dd3445)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit 6dd3445b0f60bef7dab99140165b4fd37e676efe Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 13:36:59 2013 +0200 Only show the messages, don't hide them with JS, it is confusing >--------------------------------------------------------------- coprs_frontend/coprs/static/copr.js | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/coprs_frontend/coprs/static/copr.js b/coprs_frontend/coprs/static/copr.js index 8740dc8..cb09b34 100644 --- a/coprs_frontend/coprs/static/copr.js +++ b/coprs_frontend/coprs/static/copr.js @@ -21,12 +21,9 @@ $(document).ready(function() { // admin legal-flag divs rolling $(document).ready(function() { - $("div.legal-flag").hover( + $("div.legal-flag").mouseenter( function() { $(this).children(".message").show("fast"); - }, - function() { - $(this).children(".message").hide("fast"); } - ) + ); });
1
0
0
0
[copr] master: Display list of raised legal flags on coprs in admin section (83085ec)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit 83085ec59cd0b7b51a112496e1c76134fa661c31 Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 12:35:58 2013 +0200 Display list of raised legal flags on coprs in admin section >--------------------------------------------------------------- coprs_frontend/coprs/static/copr.css | 11 ++++++++++ coprs_frontend/coprs/static/copr.js | 12 ++++++++++ coprs_frontend/coprs/templates/admin/layout.html | 8 ++++++- .../coprs/templates/admin/legal-flag.html | 18 ++++++++++++++++ .../coprs/views/admin_ns/admin_general.py | 22 ++++++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletions(-) diff --git a/coprs_frontend/coprs/static/copr.css b/coprs_frontend/coprs/static/copr.css index 243b676..a1fa40e 100644 --- a/coprs_frontend/coprs/static/copr.css +++ b/coprs_frontend/coprs/static/copr.css @@ -317,6 +317,17 @@ form.legal-flag, form.legal-flag input { margin-top: 5px; } +div.legal-flag { + margin: 10px; + font-size: 1.2em; +} + +div.legal-flag div.message { + display: none; + margin-bottom: 10px; + font-size: 1em; +} + hr { margin-top: 25px; margin-bottom: 25px; diff --git a/coprs_frontend/coprs/static/copr.js b/coprs_frontend/coprs/static/copr.js index 8271b08..8740dc8 100644 --- a/coprs_frontend/coprs/static/copr.js +++ b/coprs_frontend/coprs/static/copr.js @@ -18,3 +18,15 @@ $(document).ready(function() { } ); }); + +// admin legal-flag divs rolling +$(document).ready(function() { + $("div.legal-flag").hover( + function() { + $(this).children(".message").show("fast"); + }, + function() { + $(this).children(".message").hide("fast"); + } + ) +}); diff --git a/coprs_frontend/coprs/templates/admin/layout.html b/coprs_frontend/coprs/templates/admin/layout.html index 336e077..c8d48c9 100644 --- a/coprs_frontend/coprs/templates/admin/layout.html +++ b/coprs_frontend/coprs/templates/admin/layout.html @@ -3,6 +3,12 @@ {% block title %}Coprs - Admin{% endblock %} {% block body %} -Admin menu + <div class="horizontal-menu"> + <ul> + <li class="{% block legal_flag_selected %}unselected{% endblock %}"> + <a href="{{ url_for('admin_ns.legal_flag') }}">Legal Flags</a> + </li> + </ul> + </div> {% block admin_body %}{% endblock %} {% endblock %} diff --git a/coprs_frontend/coprs/templates/admin/legal-flag.html b/coprs_frontend/coprs/templates/admin/legal-flag.html new file mode 100644 index 0000000..e683c38 --- /dev/null +++ b/coprs_frontend/coprs/templates/admin/legal-flag.html @@ -0,0 +1,18 @@ +{% extends "admin/layout.html" %} + +{% block legal_flag_selected %}selected{% endblock %} + +{% block admin_body %} + {% for flag in legal_flags %} + <div class="legal-flag"> + <div> + <a href={{ url_for('coprs_ns.copr_detail', username=flag.copr.owner.name, coprname=flag.copr.name) }}> + {{ flag.copr.owner.name }}/{{ flag.copr.name }} + </a> + </div> + <div class="message"> + {{ flag.message }} + </div> + </div> + {% endfor %} +{% endblock %} diff --git a/coprs_frontend/coprs/views/admin_ns/admin_general.py b/coprs_frontend/coprs/views/admin_ns/admin_general.py index 8252c5e..e439809 100644 --- a/coprs_frontend/coprs/views/admin_ns/admin_general.py +++ b/coprs_frontend/coprs/views/admin_ns/admin_general.py @@ -1,6 +1,9 @@ import flask from coprs import helpers +from coprs import models + +from coprs.logic import coprs_logic from coprs.views.admin_ns import admin_ns from coprs.views.misc import login_required @@ -9,3 +12,22 @@ from coprs.views.misc import login_required @login_required(role=helpers.RoleEnum('admin')) def admin_index(): return flask.render_template('admin/index.html') + +(a)admin_ns.route('/legal-flag/') +(a)login_required(role=helpers.RoleEnum('admin')) +def legal_flag(): + legal_flags = models.Action.query.filter(models.Action.action_type==helpers.ActionTypeEnum('legal-flag')).\ + filter(models.Action.object_type=='copr').\ + filter(models.Action.ended_on==None).\ + order_by(models.Action.created_on.desc()).\ + all() + + ids = map(lambda x: x.object_id, legal_flags) + # if there are no ids, we would trigger "IN" query with empty set, which + # is not very good (and sqlalchemy complains about it) + coprs = coprs_logic.CoprsLogic.get_multiple(flask.g.user, ids=ids).all() if ids else [] + for flag in legal_flags: + flag.copr = filter(lambda x: flag.object_id == x.id, coprs)[0] + + return flask.render_template('admin/legal-flag.html', + legal_flags=legal_flags)
1
0
0
0
[copr] master: Enable retrieving multiple coprs by using list of ids (a1e9686)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit a1e9686c6021d440b1b20248c99f6d845532fd0e Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 12:35:15 2013 +0200 Enable retrieving multiple coprs by using list of ids >--------------------------------------------------------------- coprs_frontend/coprs/logic/coprs_logic.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/coprs_frontend/coprs/logic/coprs_logic.py b/coprs_frontend/coprs/logic/coprs_logic.py index e768ae0..d5cf340 100644 --- a/coprs_frontend/coprs/logic/coprs_logic.py +++ b/coprs_frontend/coprs/logic/coprs_logic.py @@ -39,13 +39,17 @@ class CoprsLogic(object): def get_multiple(cls, user, **kwargs): user_relation = kwargs.get('user_relation', None) username = kwargs.get('username', None) - with_mock_chroots = kwargs.get('with_mock_chroots') + with_mock_chroots = kwargs.get('with_mock_chroots', None) + ids = kwargs.get('ids', None) query = db.session.query(models.Copr).\ join(models.Copr.owner).\ options(db.contains_eager(models.Copr.owner)).\ order_by(models.Copr.id.desc()) + if isinstance(ids, list): # can be an empty list + query = query.filter(models.Copr.id.in_(ids)) + if user_relation == 'owned': query = query.filter(models.User.openid_name == models.User.openidize_name(username)) elif user_relation == 'allowed':
1
0
0
0
[copr] master: Store username and coprname with legal-flag action (742eeb0)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit 742eeb0c087451daa03a2204430f132b1db5e4ad Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 11:32:43 2013 +0200 Store username and coprname with legal-flag action >--------------------------------------------------------------- .../coprs/views/coprs_ns/coprs_general.py | 2 ++ 1 files changed, 2 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 8c63eee..4203af5 100644 --- a/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -268,6 +268,8 @@ def copr_legal_flag(username, coprname): object_type='copr', object_id=copr.id, message=form.comment.data, + old_value='{0}/{1}'.format(username, coprname), + new_value='{0}/{1}'.format(username, coprname), created_on=int(time.time())) db.session.add(action) db.session.commit()
1
0
0
0
[copr] master: Format legal-action action type properly (ffe9afa)
by bkabrda@fedoraproject.org
02 Apr '13
02 Apr '13
Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master >--------------------------------------------------------------- commit ffe9afaa2c36b3e7be25554978f51e14afe3737f Author: Bohuslav Kabrda <bkabrda(a)redhat.com> Date: Tue Apr 2 11:30:46 2013 +0200 Format legal-action action type properly - fix formatting of any action by using values from ActionTypeEnum >--------------------------------------------------------------- coprs_frontend/coprs/models.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py index c092e53..3beac64 100644 --- a/coprs_frontend/coprs/models.py +++ b/coprs_frontend/coprs/models.py @@ -293,12 +293,14 @@ class Action(db.Model, Serializer): return self.__unicode__() def __unicode__(self): - if self.action_type == 'delete': + if self.action_type == helpers.ActionTypeEnum('delete'): return 'Deleting {0} {1}'.format(self.object_type, self.old_value) - elif self.action_type == 'rename': + elif self.action_type == helpers.ActionTypeEnum('rename'): return 'Renaming {0} from {1} to {2}.'.format(self.object_type, self.old_value, self.new_value) + elif self.action_type == helpers.ActionTypeEnum('legal-flag'): + return 'Legal flag on copr {0}.'.format(self.old_value) return 'Action {0} on {1}, old value: {2}, new value: {3}.'.format(self.action_type, self.object_type,
1
0
0
0
← Newer
1
2
Older →
Jump to page:
1
2
Results per page:
10
25
50
100
200