Branch 'tg2merge' - server2/TODO-merge
by Pierre-YvesChibon
server2/TODO-merge | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
New commits:
commit cf1b6172ff2371315bd0ae9e3c4fde5edfc4ce56
Author: pingou <pingou(a)pingoured.fr>
Date: Thu Aug 11 15:43:13 2011 +0200
Clean and reformat TODO-merge
diff --git a/server2/TODO-merge b/server2/TODO-merge
index 7bcc138..69f9086 100644
--- a/server2/TODO-merge
+++ b/server2/TODO-merge
@@ -4,27 +4,20 @@
<mdomsch> 1b) making sure FAS integration is chosen from the config.ini file, rather than hard-coded.
<mdomsch> e.g. from development.ini, it should not use FAS
<mdomsch> 2) setting up python-migrate (sqlalchemy-migrate) to be able to update the schema over time cleanly. I spent most of yesterday making sure that, for sqlite at least, the SQL to create the tables using SA matches what the old SO had done.
-* Gomex has quit (Remote host closed the connection)
<mdomsch> I need to be able to modify the schema going forward, most of the MM1.4 changes I had made require schema changes
<mdomsch> 3) port the helper scripts from server/ into server2/. such as update-master-directory-list. Where it makes sense, move functions into the app rather than in separate helpers, leave the helpers just for invocation
<mdomsch> 4) port the MM1.4 changes into the tg2merge branch. I see ~100 patches made to the server/ directory
-<pingou> I saw that too, after I was done porting 1.3 :/
-<mdomsch> pingou: you've been a great help so far, and I really appreciate all the effort you've put into it. I couldn't have made it even this far without you. THANK YOU!
-<mdomsch> today I have to do "real work"; hopefully tomorrow afternoon I can get back into this again
<pingou> mdomsch: no problem, the hardest part is still on you: "making sure it works as it should"
-<pingou> :)
-<mdomsch> :-)
-<pingou> mdomsch: and it was fun to do :)
<mdomsch> that caught me off guard last night - if there's a fas user 'manager', and if we had lockouts after x many failed attempts, they'd be locked out :-)
-<pingou> mdomsch: two things
-<pingou> 1) right now it seems to not start (at least for me, might be a change in the db)
-<pingou> 2) there was a page (text) that didn't quite work
-<mdomsch> what db are you using?
-<pingou> sqlite, but I didn't regenerate it
-<pingou> mdomsch: working now, was a change in the db schema I guess
-<mdomsch> I spent several hours comparing SQL schemas yesterday and fixing it up to match what SO generated
<pingou> mdomsch: /rsync_acl is the still buggy function
-<mdomsch> there are still a few slight differences (TIMESTAMP vs DATETIME fields)
-<pingou> I have a script laying somewhere to compare to db scheme ^^
-<mdomsch> ok, don't sweat that too much - it's not used a lot. I see the xmlrpc stuff needs to be handled too - that's more important
-<pingou> but might be a mysql specific script
+
+
+In other words:
+0.5) /rsync_acl is the still buggy function
+1) in model/*, most of the object methods haven't been converted from SO yet, this includes the hard-coded methods to implement cascaded deletes
+1b) making sure FAS integration is chosen from the config.ini file, rather than hard-coded. (e.g. while using development.ini, it should not use FAS)
+2) setting up python-migrate (sqlalchemy-migrate) to be able to update the schema over time cleanly. I spent most of yesterday making sure that, for sqlite at least, the SQL to create the tables using SA matches what the old SO had done.
+3) port the helper scripts from server/ into server2/. such as update-master-directory-list. Where it makes sense, move functions into the app rather than in separate helpers, leave the helpers just for invocation
+4) port the MM1.4 changes into the tg2merge branch. I see ~100 patches made to the server/ directory
+5) "making sure it works as it should"
+
12 years, 7 months
Branch 'tg2merge' - server2/TODO-merge
by Matt Domsch
server2/TODO-merge | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
New commits:
commit 907618ddf1e6812d04ab0cb773d46c44ed3f3626
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Thu Aug 11 08:32:50 2011 -0500
add TODO-merge to track work needing done to finish merging
diff --git a/server2/TODO-merge b/server2/TODO-merge
new file mode 100644
index 0000000..7bcc138
--- /dev/null
+++ b/server2/TODO-merge
@@ -0,0 +1,30 @@
+<mdomsch> ok, the big stuff I see still needs doing...
+<mdomsch> 1) in model/*, most of the object methods haven't been converted from SO yet
+<mdomsch> this includes the hard-coded methods to implement cascaded deletes
+<mdomsch> 1b) making sure FAS integration is chosen from the config.ini file, rather than hard-coded.
+<mdomsch> e.g. from development.ini, it should not use FAS
+<mdomsch> 2) setting up python-migrate (sqlalchemy-migrate) to be able to update the schema over time cleanly. I spent most of yesterday making sure that, for sqlite at least, the SQL to create the tables using SA matches what the old SO had done.
+* Gomex has quit (Remote host closed the connection)
+<mdomsch> I need to be able to modify the schema going forward, most of the MM1.4 changes I had made require schema changes
+<mdomsch> 3) port the helper scripts from server/ into server2/. such as update-master-directory-list. Where it makes sense, move functions into the app rather than in separate helpers, leave the helpers just for invocation
+<mdomsch> 4) port the MM1.4 changes into the tg2merge branch. I see ~100 patches made to the server/ directory
+<pingou> I saw that too, after I was done porting 1.3 :/
+<mdomsch> pingou: you've been a great help so far, and I really appreciate all the effort you've put into it. I couldn't have made it even this far without you. THANK YOU!
+<mdomsch> today I have to do "real work"; hopefully tomorrow afternoon I can get back into this again
+<pingou> mdomsch: no problem, the hardest part is still on you: "making sure it works as it should"
+<pingou> :)
+<mdomsch> :-)
+<pingou> mdomsch: and it was fun to do :)
+<mdomsch> that caught me off guard last night - if there's a fas user 'manager', and if we had lockouts after x many failed attempts, they'd be locked out :-)
+<pingou> mdomsch: two things
+<pingou> 1) right now it seems to not start (at least for me, might be a change in the db)
+<pingou> 2) there was a page (text) that didn't quite work
+<mdomsch> what db are you using?
+<pingou> sqlite, but I didn't regenerate it
+<pingou> mdomsch: working now, was a change in the db schema I guess
+<mdomsch> I spent several hours comparing SQL schemas yesterday and fixing it up to match what SO generated
+<pingou> mdomsch: /rsync_acl is the still buggy function
+<mdomsch> there are still a few slight differences (TIMESTAMP vs DATETIME fields)
+<pingou> I have a script laying somewhere to compare to db scheme ^^
+<mdomsch> ok, don't sweat that too much - it's not used a lot. I see the xmlrpc stuff needs to be handled too - that's more important
+<pingou> but might be a mysql specific script
12 years, 7 months
Branch 'tg2merge' - server2/mirrormanager
by Matt Domsch
server2/mirrormanager/model/auth.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 5f1d525140ec044added076eaee1eff63e1553a4
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Thu Aug 11 00:50:24 2011 -0500
more password fixing
diff --git a/server2/mirrormanager/model/auth.py b/server2/mirrormanager/model/auth.py
index 3d624fc..1ad110a 100644
--- a/server2/mirrormanager/model/auth.py
+++ b/server2/mirrormanager/model/auth.py
@@ -112,8 +112,7 @@ class User(DeclarativeBase):
display_name = Column(Unicode(255))
- _password = Column('password', Unicode(40),
- info={'rum': {'field':'Password'}})
+ password = Column(Unicode(40))
created = Column(DateTime, default=datetime.utcnow)
12 years, 7 months
Branch 'tg2merge' - server2/mirrormanager
by Matt Domsch
server2/mirrormanager/model/auth.py | 25 +++----------------------
1 file changed, 3 insertions(+), 22 deletions(-)
New commits:
commit 05a12e5e353958c6f92769a1e2dd45b8f36da69d
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Thu Aug 11 00:23:15 2011 -0500
revert password handling to match SQLObject
Because existing installation schemas expect it, passwords are stored
(stupidly) plaintext in the database by default. Adjust our code to
match for now.
This will get fixed in a schema update at some point, but we need to
add length to the password field to do so, then go an encrypt
passwords already stored.
diff --git a/server2/mirrormanager/model/auth.py b/server2/mirrormanager/model/auth.py
index 8e7a562..3d624fc 100644
--- a/server2/mirrormanager/model/auth.py
+++ b/server2/mirrormanager/model/auth.py
@@ -146,28 +146,9 @@ class User(DeclarativeBase):
"""Return the user object whose user name is ``username``."""
return DBSession.query(cls).filter(cls.user_name == username).first()
- def _set_password(self, password):
- """Hash ``password`` on the fly and store its hashed version."""
- # Make sure password is a str because we cannot hash unicode objects
- if isinstance(password, unicode):
- password = password.encode('utf-8')
- salt = sha1()
- salt.update(os.urandom(60))
- hash = sha1()
- hash.update(password + salt.hexdigest())
- password = salt.hexdigest() + hash.hexdigest()
- # Make sure the hashed password is a unicode object at the end of the
- # process because SQLAlchemy _wants_ unicode objects for Unicode cols
- if not isinstance(password, unicode):
- password = password.decode('utf-8')
- self._password = password
-
- def _get_password(self):
- """Return the hashed version of the password."""
- return self._password
-
- password = synonym('_password', descriptor=property(_get_password,
- _set_password))
+
+ # because we're coming from old SQLObject schemas, we need to use the old hash function
+ # to keep the size constant. Stupidly, by default it stored plaintext passwords. :-(
#}
12 years, 7 months
Branch 'refs/remotes/tg2merge/master' - 2 commits - server2/mirrormanager
by Matt Domsch
server2/mirrormanager/controllers/arch.py | 41 ------
server2/mirrormanager/controllers/countrycontinentredirect.py | 53 -------
server2/mirrormanager/controllers/embargoedcountry.py | 60 --------
server2/mirrormanager/controllers/host.py | 1
server2/mirrormanager/controllers/hostaclip.py | 1
server2/mirrormanager/controllers/hostcategory.py | 1
server2/mirrormanager/controllers/hostcategoryurl.py | 1
server2/mirrormanager/controllers/hostlistitem.py | 1
server2/mirrormanager/controllers/hostnetblock.py | 1
server2/mirrormanager/controllers/product.py | 43 ------
server2/mirrormanager/controllers/repository.py | 55 --------
server2/mirrormanager/controllers/repositoryredirect.py | 54 -------
server2/mirrormanager/controllers/root.py | 40 -----
server2/mirrormanager/controllers/simpledbobject.py | 1
server2/mirrormanager/controllers/siteadmin.py | 1
server2/mirrormanager/controllers/version.py | 68 ----------
16 files changed, 2 insertions(+), 420 deletions(-)
New commits:
commit 2269668e4245fb3814bae16387d7edfaf2107ed5
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Aug 10 22:52:52 2011 -0500
remove duplicate import
diff --git a/server2/mirrormanager/controllers/host.py b/server2/mirrormanager/controllers/host.py
index 460670b..34df7e0 100644
--- a/server2/mirrormanager/controllers/host.py
+++ b/server2/mirrormanager/controllers/host.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostaclip.py b/server2/mirrormanager/controllers/hostaclip.py
index 39d48bc..f5aacbd 100644
--- a/server2/mirrormanager/controllers/hostaclip.py
+++ b/server2/mirrormanager/controllers/hostaclip.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostcategory.py b/server2/mirrormanager/controllers/hostcategory.py
index a8e965d..944bd16 100644
--- a/server2/mirrormanager/controllers/hostcategory.py
+++ b/server2/mirrormanager/controllers/hostcategory.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostcategoryurl.py b/server2/mirrormanager/controllers/hostcategoryurl.py
index 0281313..335f319 100644
--- a/server2/mirrormanager/controllers/hostcategoryurl.py
+++ b/server2/mirrormanager/controllers/hostcategoryurl.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostlistitem.py b/server2/mirrormanager/controllers/hostlistitem.py
index 1f77840..aaddf44 100644
--- a/server2/mirrormanager/controllers/hostlistitem.py
+++ b/server2/mirrormanager/controllers/hostlistitem.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostnetblock.py b/server2/mirrormanager/controllers/hostnetblock.py
index 81fd82d..63867ed 100644
--- a/server2/mirrormanager/controllers/hostnetblock.py
+++ b/server2/mirrormanager/controllers/hostnetblock.py
@@ -17,7 +17,6 @@ IPy.check_addr_prefixlen = 0
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/root.py b/server2/mirrormanager/controllers/root.py
index 485ca35..58ac58a 100644
--- a/server2/mirrormanager/controllers/root.py
+++ b/server2/mirrormanager/controllers/root.py
@@ -10,7 +10,6 @@ from repoze.what import predicates
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from fedora.client import AuthError, AppError
diff --git a/server2/mirrormanager/controllers/simpledbobject.py b/server2/mirrormanager/controllers/simpledbobject.py
index 86c6282..eb2b0a3 100644
--- a/server2/mirrormanager/controllers/simpledbobject.py
+++ b/server2/mirrormanager/controllers/simpledbobject.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/siteadmin.py b/server2/mirrormanager/controllers/siteadmin.py
index ac5cdfa..0649979 100644
--- a/server2/mirrormanager/controllers/siteadmin.py
+++ b/server2/mirrormanager/controllers/siteadmin.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
commit b43430b0e53cfb43ad9f0ac20c093d101b42d7c9
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Aug 10 22:49:09 2011 -0500
remove controllers for bits that AdminController can do far better
diff --git a/server2/mirrormanager/controllers/arch.py b/server2/mirrormanager/controllers/arch.py
deleted file mode 100644
index 72865c1..0000000
--- a/server2/mirrormanager/controllers/arch.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Arch Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-arch_form = ArchForm(submit_text='Create Arch')
-
-class ArchController(SimpleDbObjectController):
- page_title="Arch"
- myClass = Arch
- url_prefix="arch"
- form = arch_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=arch_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
diff --git a/server2/mirrormanager/controllers/countrycontinentredirect.py b/server2/mirrormanager/controllers/countrycontinentredirect.py
deleted file mode 100644
index 70aef22..0000000
--- a/server2/mirrormanager/controllers/countrycontinentredirect.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Country Continent redirect Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-country_continent_redirect_form = CountryContinentRedirectForm(submit_text="Create Country->Continent Redirect")
-
-
-class CountryContinentRedirectController(SimpleDbObjectController):
- page_title = "CountryContinentRedirect"
- myClass = CountryContinentRedirect
- url_prefix="country_continent_redirect"
- form = country_continent_redirect_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- model.DBSession.query(CountryContinentRedirect).update(kwargs)
- submit_action = url("/country_continent_redirect/%s" % obj)
- redirect(submit_action)
- #return SimpleDbObjectController.update(self, obj, **kwargs)
diff --git a/server2/mirrormanager/controllers/embargoedcountry.py b/server2/mirrormanager/controllers/embargoedcountry.py
deleted file mode 100644
index 2e4e673..0000000
--- a/server2/mirrormanager/controllers/embargoedcountry.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Embargoed Country Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-embargoed_country_form = EmbargoedCountryForm(submit_text='Create Embargoed Country')
-
-
-class EmbargoedCountryController(SimpleDbObjectController):
- page_title="Embargoed Country"
- myClass = EmbargoedCountry
- url_prefix="embargoed_country"
- form = embargoed_country_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=embargoed_country_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringdeleteform")
- def delete(self, obj, **kwargs):
- obj = model.DBSession.query(EmbargoedCountry).filter_by(id = obj).one()
- obj.name = obj.country_code
- confirmed = kwargs.get('confirmed', None)
- confirm_delete_form = ConfirmDeleteForm(submit_text="Yes, really delete it!")
- if confirmed:
- flash("%s has been deleted." % obj.name)
- model.DBSession.delete(obj)
- redirect(url("/adminview"))
- else:
- form = confirm_delete_form
- page_title = "Item Deletion"
- submit_action = url("/embargoed_country/delete/%s?confirmed=1" % (
- obj.id))
- return dict(form=form, values=obj,
- action=submit_action, page_title=page_title)
diff --git a/server2/mirrormanager/controllers/product.py b/server2/mirrormanager/controllers/product.py
deleted file mode 100644
index f19ae33..0000000
--- a/server2/mirrormanager/controllers/product.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Product Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-product_form = ProductForm(submit_text='Create Product')
-
-
-class ProductController(SimpleDbObjectController):
- page_title = "Product"
- form = product_form
- myClass = Product
- url_prefix="product"
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=product_form)
- def create(self, came_from='/', **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- SimpleDbObjectController.create(self, **kwargs)
diff --git a/server2/mirrormanager/controllers/repository.py b/server2/mirrormanager/controllers/repository.py
deleted file mode 100644
index 63e14e2..0000000
--- a/server2/mirrormanager/controllers/repository.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Repository Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-repository_form = RepositoryForm(submit_text='Edit Version')
-
-
-class RepositoryController(SimpleDbObjectController):
- page_title = "Repository"
- form = repository_form
- myClass = Repository
- url_prefix="repository"
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=repository_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- return SimpleDbObjectController.create(self, **kwargs)
-
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=repository_form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- model.DBSession.query(Repository).update(kwargs)
- submit_action = url("/repository/%s" % obj)
- redirect(submit_action)
diff --git a/server2/mirrormanager/controllers/repositoryredirect.py b/server2/mirrormanager/controllers/repositoryredirect.py
deleted file mode 100644
index d147d9d..0000000
--- a/server2/mirrormanager/controllers/repositoryredirect.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Repository Redirect Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-repository_redirect_form = RepositoryRedirectForm(submit_text="Create Repository Redirect")
-
-
-class RepositoryRedirectController(SimpleDbObjectController):
- page_title = "RepositoryRedirect"
- myClass = RepositoryRedirect
- url_prefix="repository_redirect"
- form = repository_redirect_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- model.DBSession.query(RepositoryRedirect).update(kwargs)
- submit_action = url("/repository_redirect/%s" % obj)
- redirect(submit_action)
diff --git a/server2/mirrormanager/controllers/root.py b/server2/mirrormanager/controllers/root.py
index 5dd23c2..485ca35 100644
--- a/server2/mirrormanager/controllers/root.py
+++ b/server2/mirrormanager/controllers/root.py
@@ -19,9 +19,6 @@ from fedora.client.fas2 import AccountSystem
from mirrormanager import model
from mirrormanager.model import *
-from mirrormanager.controllers.arch import *
-from mirrormanager.controllers.countrycontinentredirect import *
-from mirrormanager.controllers.embargoedcountry import *
from mirrormanager.controllers.host import *
from mirrormanager.controllers.hostaclip import *
from mirrormanager.controllers.hostcategory import *
@@ -29,20 +26,16 @@ from mirrormanager.controllers.hostcategoryurl import *
from mirrormanager.controllers.hostcountryallowed import *
from mirrormanager.controllers.hostnetblock import *
from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.product import *
-from mirrormanager.controllers.repository import *
-from mirrormanager.controllers.repositoryredirect import *
from mirrormanager.controllers.site import *
from mirrormanager.controllers.site2site import *
from mirrormanager.controllers.siteadmin import *
-from mirrormanager.controllers.version import *
from mirrormanager.controllers.utils import *
__all__ = ['RootController', 'SiteController', 'SiteToSiteController',
'HostController', 'SiteAdminController', 'HostCategoryUrlController',
- 'HostCategoryController', 'ArchController'
+ 'HostCategoryController',
]
@@ -84,13 +77,7 @@ class RootController(BaseController):
host_category = HostCategoryController()
host_category_url = HostCategoryUrlController()
site2site = SiteToSiteController()
- product = ProductController()
- version = VersionController()
- arch = ArchController()
- embargoed_country = EmbargoedCountryController()
- repository = RepositoryController()
- repository_redirect = RepositoryRedirectController()
- country_continent_redirect = CountryContinentRedirectController()
+
#from mirrormanager.xmlrpc import XmlrpcController
#xmlrpc = XmlrpcController()
@@ -189,28 +176,6 @@ class RootController(BaseController):
redirect(came_from)
## End Of TG2's functions
- @expose(template="mirrormanager.templates.adminview")
- #(a)require(predicates.has_permission('manage', msg=l_('Only for managers')))
- def adminview(self):
- versions = model.DBSession.query(Version).order_by('name').all()
- for version in versions:
- version.productobj = model.DBSession.query(Product).filter_by(id = version.product).one()
- netblocks = model.DBSession.query(HostNetblock).order_by('host_id').all()
- for netblock in netblocks:
- netblock.hostobj = model.DBSession.query(Host).filter_by(id = netblock.host).one()
- return {"sites": model.DBSession.query(Site).order_by('name').all(),
- "arches": model.DBSession.query(Arch).order_by('name').all(),
- "products": model.DBSession.query(Product).order_by('name').all(),
- "versions": versions,
- "directories": model.DBSession.query(Directory).order_by('name').all(),
- "categories": model.DBSession.query(Category).order_by('name').all(),
- "repositories": model.DBSession.query(Repository).order_by('name').all(),
- "embargoed_countries": model.DBSession.query(EmbargoedCountry).all(),
- "netblocks": netblocks,
- "repository_redirects": model.DBSession.query(RepositoryRedirect).order_by('fromRepo').all(),
- "country_continent_redirects": model.DBSession.query(CountryContinentRedirect).order_by('country').all(),
- }
-
@expose(template="mirrormanager.templates.rsync_acl",
content_type="text/plain")
def rsync_acl(self, **kwargs):
diff --git a/server2/mirrormanager/controllers/version.py b/server2/mirrormanager/controllers/version.py
deleted file mode 100644
index e122daa..0000000
--- a/server2/mirrormanager/controllers/version.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Version Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-version_form = VersionForm(submit_text='Create Version')
-version_form_update = VersionForm(submit_text='Update Version')
-
-
-class VersionController(SimpleDbObjectController):
- page_title = "Version"
- myClass = Version
- url_prefix="version"
- form = version_form
- form_update = version_form_update
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def default(self, id):
- version = model.DBSession.query(Version).filter_by(id = id).one()
- submit_action = url("/version/update/%s" % version.id)
- return dict(form=self.form_update, values=version, action=submit_action,
- page_title="Version")
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- #(a)error_handler(SimpleDbObjectController.new)
- def create(self, **kwargs):
- try:
- product = model.DBSession.query(Product).filter_by(id = kwargs['product']).one()
- except Exception, er:
- print "Error:", er
- flash("Error: invalid product - foul play?")
- raise redirect(url("/"))
-
- del kwargs['product']
-
- SimpleDbObjectController.create(self, product=product.id, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- #@error_handler()
- def update(self, obj, **kwargs):
- kwargs['display'] = bool(kwargs['display'])
- model.DBSession.query(Version).update(kwargs)
- submit_action = url("/version/%s" % obj)
- redirect(submit_action)
12 years, 7 months
Branch 'tg2merge' - 2 commits - server2/mirrormanager
by Matt Domsch
server2/mirrormanager/controllers/arch.py | 41 ------
server2/mirrormanager/controllers/countrycontinentredirect.py | 53 -------
server2/mirrormanager/controllers/embargoedcountry.py | 60 --------
server2/mirrormanager/controllers/host.py | 1
server2/mirrormanager/controllers/hostaclip.py | 1
server2/mirrormanager/controllers/hostcategory.py | 1
server2/mirrormanager/controllers/hostcategoryurl.py | 1
server2/mirrormanager/controllers/hostlistitem.py | 1
server2/mirrormanager/controllers/hostnetblock.py | 1
server2/mirrormanager/controllers/product.py | 43 ------
server2/mirrormanager/controllers/repository.py | 55 --------
server2/mirrormanager/controllers/repositoryredirect.py | 54 -------
server2/mirrormanager/controllers/root.py | 40 -----
server2/mirrormanager/controllers/simpledbobject.py | 1
server2/mirrormanager/controllers/siteadmin.py | 1
server2/mirrormanager/controllers/version.py | 68 ----------
16 files changed, 2 insertions(+), 420 deletions(-)
New commits:
commit 2269668e4245fb3814bae16387d7edfaf2107ed5
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Aug 10 22:52:52 2011 -0500
remove duplicate import
diff --git a/server2/mirrormanager/controllers/host.py b/server2/mirrormanager/controllers/host.py
index 460670b..34df7e0 100644
--- a/server2/mirrormanager/controllers/host.py
+++ b/server2/mirrormanager/controllers/host.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostaclip.py b/server2/mirrormanager/controllers/hostaclip.py
index 39d48bc..f5aacbd 100644
--- a/server2/mirrormanager/controllers/hostaclip.py
+++ b/server2/mirrormanager/controllers/hostaclip.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostcategory.py b/server2/mirrormanager/controllers/hostcategory.py
index a8e965d..944bd16 100644
--- a/server2/mirrormanager/controllers/hostcategory.py
+++ b/server2/mirrormanager/controllers/hostcategory.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostcategoryurl.py b/server2/mirrormanager/controllers/hostcategoryurl.py
index 0281313..335f319 100644
--- a/server2/mirrormanager/controllers/hostcategoryurl.py
+++ b/server2/mirrormanager/controllers/hostcategoryurl.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostlistitem.py b/server2/mirrormanager/controllers/hostlistitem.py
index 1f77840..aaddf44 100644
--- a/server2/mirrormanager/controllers/hostlistitem.py
+++ b/server2/mirrormanager/controllers/hostlistitem.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/hostnetblock.py b/server2/mirrormanager/controllers/hostnetblock.py
index 81fd82d..63867ed 100644
--- a/server2/mirrormanager/controllers/hostnetblock.py
+++ b/server2/mirrormanager/controllers/hostnetblock.py
@@ -17,7 +17,6 @@ IPy.check_addr_prefixlen = 0
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/root.py b/server2/mirrormanager/controllers/root.py
index 485ca35..58ac58a 100644
--- a/server2/mirrormanager/controllers/root.py
+++ b/server2/mirrormanager/controllers/root.py
@@ -10,7 +10,6 @@ from repoze.what import predicates
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from fedora.client import AuthError, AppError
diff --git a/server2/mirrormanager/controllers/simpledbobject.py b/server2/mirrormanager/controllers/simpledbobject.py
index 86c6282..eb2b0a3 100644
--- a/server2/mirrormanager/controllers/simpledbobject.py
+++ b/server2/mirrormanager/controllers/simpledbobject.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
diff --git a/server2/mirrormanager/controllers/siteadmin.py b/server2/mirrormanager/controllers/siteadmin.py
index ac5cdfa..0649979 100644
--- a/server2/mirrormanager/controllers/siteadmin.py
+++ b/server2/mirrormanager/controllers/siteadmin.py
@@ -14,7 +14,6 @@ from sqlalchemy import and_
from mirrormanager.lib.base import BaseController
from mirrormanager.model import DBSession, metadata
from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
from mirrormanager.controllers.secure import SecureController
from mirrormanager import model
commit b43430b0e53cfb43ad9f0ac20c093d101b42d7c9
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Wed Aug 10 22:49:09 2011 -0500
remove controllers for bits that AdminController can do far better
diff --git a/server2/mirrormanager/controllers/arch.py b/server2/mirrormanager/controllers/arch.py
deleted file mode 100644
index 72865c1..0000000
--- a/server2/mirrormanager/controllers/arch.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Arch Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-arch_form = ArchForm(submit_text='Create Arch')
-
-class ArchController(SimpleDbObjectController):
- page_title="Arch"
- myClass = Arch
- url_prefix="arch"
- form = arch_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=arch_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
diff --git a/server2/mirrormanager/controllers/countrycontinentredirect.py b/server2/mirrormanager/controllers/countrycontinentredirect.py
deleted file mode 100644
index 70aef22..0000000
--- a/server2/mirrormanager/controllers/countrycontinentredirect.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Country Continent redirect Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-country_continent_redirect_form = CountryContinentRedirectForm(submit_text="Create Country->Continent Redirect")
-
-
-class CountryContinentRedirectController(SimpleDbObjectController):
- page_title = "CountryContinentRedirect"
- myClass = CountryContinentRedirect
- url_prefix="country_continent_redirect"
- form = country_continent_redirect_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- model.DBSession.query(CountryContinentRedirect).update(kwargs)
- submit_action = url("/country_continent_redirect/%s" % obj)
- redirect(submit_action)
- #return SimpleDbObjectController.update(self, obj, **kwargs)
diff --git a/server2/mirrormanager/controllers/embargoedcountry.py b/server2/mirrormanager/controllers/embargoedcountry.py
deleted file mode 100644
index 2e4e673..0000000
--- a/server2/mirrormanager/controllers/embargoedcountry.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Embargoed Country Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-embargoed_country_form = EmbargoedCountryForm(submit_text='Create Embargoed Country')
-
-
-class EmbargoedCountryController(SimpleDbObjectController):
- page_title="Embargoed Country"
- myClass = EmbargoedCountry
- url_prefix="embargoed_country"
- form = embargoed_country_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=embargoed_country_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringdeleteform")
- def delete(self, obj, **kwargs):
- obj = model.DBSession.query(EmbargoedCountry).filter_by(id = obj).one()
- obj.name = obj.country_code
- confirmed = kwargs.get('confirmed', None)
- confirm_delete_form = ConfirmDeleteForm(submit_text="Yes, really delete it!")
- if confirmed:
- flash("%s has been deleted." % obj.name)
- model.DBSession.delete(obj)
- redirect(url("/adminview"))
- else:
- form = confirm_delete_form
- page_title = "Item Deletion"
- submit_action = url("/embargoed_country/delete/%s?confirmed=1" % (
- obj.id))
- return dict(form=form, values=obj,
- action=submit_action, page_title=page_title)
diff --git a/server2/mirrormanager/controllers/product.py b/server2/mirrormanager/controllers/product.py
deleted file mode 100644
index f19ae33..0000000
--- a/server2/mirrormanager/controllers/product.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Product Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-product_form = ProductForm(submit_text='Create Product')
-
-
-class ProductController(SimpleDbObjectController):
- page_title = "Product"
- form = product_form
- myClass = Product
- url_prefix="product"
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=product_form)
- def create(self, came_from='/', **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- SimpleDbObjectController.create(self, **kwargs)
diff --git a/server2/mirrormanager/controllers/repository.py b/server2/mirrormanager/controllers/repository.py
deleted file mode 100644
index 63e14e2..0000000
--- a/server2/mirrormanager/controllers/repository.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Repository Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-repository_form = RepositoryForm(submit_text='Edit Version')
-
-
-class RepositoryController(SimpleDbObjectController):
- page_title = "Repository"
- form = repository_form
- myClass = Repository
- url_prefix="repository"
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=repository_form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- return SimpleDbObjectController.create(self, **kwargs)
-
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=repository_form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- model.DBSession.query(Repository).update(kwargs)
- submit_action = url("/repository/%s" % obj)
- redirect(submit_action)
diff --git a/server2/mirrormanager/controllers/repositoryredirect.py b/server2/mirrormanager/controllers/repositoryredirect.py
deleted file mode 100644
index d147d9d..0000000
--- a/server2/mirrormanager/controllers/repositoryredirect.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Repository Redirect Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template, tmpl_context
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-repository_redirect_form = RepositoryRedirectForm(submit_text="Create Repository Redirect")
-
-
-class RepositoryRedirectController(SimpleDbObjectController):
- page_title = "RepositoryRedirect"
- myClass = RepositoryRedirect
- url_prefix="repository_redirect"
- form = repository_redirect_form
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def create(self, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- SimpleDbObjectController.create(self, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def update(self, obj, **kwargs):
- if tmpl_context.form_errors:
- flash("Invalid input")
- return self.new(**kwargs)
-
- model.DBSession.query(RepositoryRedirect).update(kwargs)
- submit_action = url("/repository_redirect/%s" % obj)
- redirect(submit_action)
diff --git a/server2/mirrormanager/controllers/root.py b/server2/mirrormanager/controllers/root.py
index 5dd23c2..485ca35 100644
--- a/server2/mirrormanager/controllers/root.py
+++ b/server2/mirrormanager/controllers/root.py
@@ -19,9 +19,6 @@ from fedora.client.fas2 import AccountSystem
from mirrormanager import model
from mirrormanager.model import *
-from mirrormanager.controllers.arch import *
-from mirrormanager.controllers.countrycontinentredirect import *
-from mirrormanager.controllers.embargoedcountry import *
from mirrormanager.controllers.host import *
from mirrormanager.controllers.hostaclip import *
from mirrormanager.controllers.hostcategory import *
@@ -29,20 +26,16 @@ from mirrormanager.controllers.hostcategoryurl import *
from mirrormanager.controllers.hostcountryallowed import *
from mirrormanager.controllers.hostnetblock import *
from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.product import *
-from mirrormanager.controllers.repository import *
-from mirrormanager.controllers.repositoryredirect import *
from mirrormanager.controllers.site import *
from mirrormanager.controllers.site2site import *
from mirrormanager.controllers.siteadmin import *
-from mirrormanager.controllers.version import *
from mirrormanager.controllers.utils import *
__all__ = ['RootController', 'SiteController', 'SiteToSiteController',
'HostController', 'SiteAdminController', 'HostCategoryUrlController',
- 'HostCategoryController', 'ArchController'
+ 'HostCategoryController',
]
@@ -84,13 +77,7 @@ class RootController(BaseController):
host_category = HostCategoryController()
host_category_url = HostCategoryUrlController()
site2site = SiteToSiteController()
- product = ProductController()
- version = VersionController()
- arch = ArchController()
- embargoed_country = EmbargoedCountryController()
- repository = RepositoryController()
- repository_redirect = RepositoryRedirectController()
- country_continent_redirect = CountryContinentRedirectController()
+
#from mirrormanager.xmlrpc import XmlrpcController
#xmlrpc = XmlrpcController()
@@ -189,28 +176,6 @@ class RootController(BaseController):
redirect(came_from)
## End Of TG2's functions
- @expose(template="mirrormanager.templates.adminview")
- #(a)require(predicates.has_permission('manage', msg=l_('Only for managers')))
- def adminview(self):
- versions = model.DBSession.query(Version).order_by('name').all()
- for version in versions:
- version.productobj = model.DBSession.query(Product).filter_by(id = version.product).one()
- netblocks = model.DBSession.query(HostNetblock).order_by('host_id').all()
- for netblock in netblocks:
- netblock.hostobj = model.DBSession.query(Host).filter_by(id = netblock.host).one()
- return {"sites": model.DBSession.query(Site).order_by('name').all(),
- "arches": model.DBSession.query(Arch).order_by('name').all(),
- "products": model.DBSession.query(Product).order_by('name').all(),
- "versions": versions,
- "directories": model.DBSession.query(Directory).order_by('name').all(),
- "categories": model.DBSession.query(Category).order_by('name').all(),
- "repositories": model.DBSession.query(Repository).order_by('name').all(),
- "embargoed_countries": model.DBSession.query(EmbargoedCountry).all(),
- "netblocks": netblocks,
- "repository_redirects": model.DBSession.query(RepositoryRedirect).order_by('fromRepo').all(),
- "country_continent_redirects": model.DBSession.query(CountryContinentRedirect).order_by('country').all(),
- }
-
@expose(template="mirrormanager.templates.rsync_acl",
content_type="text/plain")
def rsync_acl(self, **kwargs):
diff --git a/server2/mirrormanager/controllers/version.py b/server2/mirrormanager/controllers/version.py
deleted file mode 100644
index e122daa..0000000
--- a/server2/mirrormanager/controllers/version.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Version Controller"""
-
-import transaction
-
-from tg import expose, flash, require, url, request, redirect, validate
-from tg.decorators import override_template
-from pylons.i18n import ugettext as _, lazy_ugettext as l_
-from tgext.admin.tgadminconfig import TGAdminConfig
-from tgext.admin.controller import AdminController
-from repoze.what import predicates
-from sqlalchemy import and_
-
-from mirrormanager.lib.base import BaseController
-from mirrormanager.model import DBSession, metadata
-from mirrormanager.controllers.error import ErrorController
-from mirrormanager import model
-from mirrormanager.controllers.secure import SecureController
-
-from mirrormanager import model
-from mirrormanager.model import *
-
-from mirrormanager.controllers.forms import *
-from mirrormanager.controllers.utils import *
-from mirrormanager.controllers.simpledbobject import *
-
-version_form = VersionForm(submit_text='Create Version')
-version_form_update = VersionForm(submit_text='Update Version')
-
-
-class VersionController(SimpleDbObjectController):
- page_title = "Version"
- myClass = Version
- url_prefix="version"
- form = version_form
- form_update = version_form_update
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- def default(self, id):
- version = model.DBSession.query(Version).filter_by(id = id).one()
- submit_action = url("/version/update/%s" % version.id)
- return dict(form=self.form_update, values=version, action=submit_action,
- page_title="Version")
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- #(a)error_handler(SimpleDbObjectController.new)
- def create(self, **kwargs):
- try:
- product = model.DBSession.query(Product).filter_by(id = kwargs['product']).one()
- except Exception, er:
- print "Error:", er
- flash("Error: invalid product - foul play?")
- raise redirect(url("/"))
-
- del kwargs['product']
-
- SimpleDbObjectController.create(self, product=product.id, **kwargs)
-
- @expose(template="mirrormanager.templates.boringform")
- @validate(form=form)
- #@error_handler()
- def update(self, obj, **kwargs):
- kwargs['display'] = bool(kwargs['display'])
- model.DBSession.query(Version).update(kwargs)
- submit_action = url("/version/%s" % obj)
- redirect(submit_action)
12 years, 7 months