Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
1e563b54
Commit
1e563b54
authored
Apr 29, 2013
by
Giorgos Korfiatis
Browse files
Revert quotaholder's name to quotaholder_app
In order to facilitate migrations.
parent
e87b125c
Changes
10
Hide whitespace changes
Inline
Side-by-side
snf-astakos-app/astakos/api/quotas.py
View file @
1e563b54
...
...
@@ -47,8 +47,8 @@ from astakos.im.api.service import service_from_token
from
astakos.im.resources
import
get_resources
from
astakos.im.quotas
import
get_user_quotas
,
service_get_quotas
import
astakos.quotaholder.exception
as
qh_exception
import
astakos.quotaholder.callpoint
as
qh
import
astakos.quotaholder
_app
.exception
as
qh_exception
import
astakos.quotaholder
_app
.callpoint
as
qh
@
api
.
api_method
(
http_method
=
'GET'
,
token_required
=
True
,
user_required
=
False
)
...
...
snf-astakos-app/astakos/im/functions.py
View file @
1e563b54
...
...
@@ -78,7 +78,7 @@ from astakos.im.project_notif import (
project_termination_notify
,
project_suspension_notify
)
from
astakos.im
import
settings
import
astakos.im.messages
as
astakos_messages
from
astakos.quotaholder.exception
import
NoCapacityError
from
astakos.quotaholder
_app
.exception
import
NoCapacityError
logger
=
logging
.
getLogger
(
__name__
)
...
...
snf-astakos-app/astakos/im/quotas.py
View file @
1e563b54
...
...
@@ -34,7 +34,7 @@
from
astakos.im.models
import
(
Resource
,
AstakosUserQuota
,
AstakosUser
,
Project
,
ProjectMembership
,
ProjectResourceGrant
,
ProjectApplication
)
import
astakos.quotaholder.callpoint
as
qh
import
astakos.quotaholder
_app
.callpoint
as
qh
from
django.db.models
import
Q
...
...
snf-astakos-app/astakos/quotaholder/__init__.py
→
snf-astakos-app/astakos/quotaholder
_app
/__init__.py
View file @
1e563b54
File moved
snf-astakos-app/astakos/quotaholder/callpoint.py
→
snf-astakos-app/astakos/quotaholder
_app
/callpoint.py
View file @
1e563b54
...
...
@@ -32,17 +32,17 @@
# or implied, of GRNET S.A.
from
django.db.models
import
F
from
astakos.quotaholder.exception
import
(
from
astakos.quotaholder
_app
.exception
import
(
QuotaholderError
,
NoCommissionError
,
CorruptedError
,
InvalidDataError
,
NoHoldingError
,
DuplicateError
)
from
astakos.quotaholder.commission
import
(
from
astakos.quotaholder
_app
.commission
import
(
Import
,
Release
,
Operations
,
finalize
,
undo
)
from
.models
import
(
Holding
,
from
astakos.quotaholder_app
.models
import
(
Holding
,
Commission
,
Provision
,
ProvisionLog
,
now
)
...
...
snf-astakos-app/astakos/quotaholder/commission.py
→
snf-astakos-app/astakos/quotaholder
_app
/commission.py
View file @
1e563b54
...
...
@@ -31,7 +31,7 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
from
astakos.quotaholder.exception
import
NoCapacityError
,
NoQuantityError
from
astakos.quotaholder
_app
.exception
import
NoCapacityError
,
NoQuantityError
class
Operation
(
object
):
...
...
snf-astakos-app/astakos/quotaholder/exception.py
→
snf-astakos-app/astakos/quotaholder
_app
/exception.py
View file @
1e563b54
File moved
snf-astakos-app/astakos/quotaholder/models.py
→
snf-astakos-app/astakos/quotaholder
_app
/models.py
View file @
1e563b54
File moved
snf-astakos-app/astakos/quotaholder/tests.py
→
snf-astakos-app/astakos/quotaholder
_app
/tests.py
View file @
1e563b54
...
...
@@ -33,8 +33,8 @@
from
django.test
import
TestCase
import
astakos.quotaholder.callpoint
as
qh
from
astakos.quotaholder.exception
import
(
import
astakos.quotaholder
_app
.callpoint
as
qh
from
astakos.quotaholder
_app
.exception
import
(
InvalidDataError
,
NoCommissionError
,
NoQuantityError
,
...
...
snf-astakos-app/astakos/synnefo_settings.py
View file @
1e563b54
...
...
@@ -44,7 +44,7 @@ installed_apps = [
'django.contrib.sessions'
,
'django.contrib.messages'
,
'django_tables2'
,
'astakos.quotaholder'
,
'astakos.quotaholder
_app
'
,
# 'debug_toolbar',
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment