From 3fe3ff07635933df0e61b64424caa92866722ae5 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jun 11 2015 16:54:50 +0000 Subject: Allow setting the avatar_email and the url when creating the project --- diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index 3f7c499..98f0364 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -724,7 +724,8 @@ def add_pull_request_flag(session, request, username, percent, comment, url, def new_project(session, user, name, blacklist, gitfolder, docfolder, ticketfolder, requestfolder, - description=None, parent_id=None): + description=None, url=None,avatar_email=None, + parent_id=None): ''' Create a new project based on the information provided. ''' if name in blacklist: @@ -743,7 +744,9 @@ def new_project(session, user, name, blacklist, project = model.Project( name=name, - description=description, + description=description if description else None, + url=url if url else None, + avatar_email=avatar_email if avatar_email else None, user_id=user_obj.id, parent_id=parent_id, hook_token=pagure.lib.login.id_generator(40) diff --git a/pagure/templates/new_project.html b/pagure/templates/new_project.html index 022c495..47fae59 100644 --- a/pagure/templates/new_project.html +++ b/pagure/templates/new_project.html @@ -14,6 +14,8 @@ {{ render_field_in_row(form.name) }} {{ render_field_in_row(form.description) }} + {{ render_field_in_row(form.url) }} + {{ render_field_in_row(form.avatar_email) }}

diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 573e56b..13c7ab7 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -232,12 +232,16 @@ def new_project(): if form.validate_on_submit(): name = form.name.data description = form.description.data + url = form.url.data + avatar_email = form.avatar_email.data try: message = pagure.lib.new_project( SESSION, name=name, description=description, + url=url, + avatar_email=avatar_email, user=flask.g.fas_user.username, blacklist=APP.config['BLACKLISTED_PROJECTS'], gitfolder=APP.config['GIT_FOLDER'],