projects
/
snf-cloudcms
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ui: Additional Pithos versioninfo.xml client type
[snf-cloudcms]
/
cloudcms
/
forms.py
diff --git
a/cloudcms/forms.py
b/cloudcms/forms.py
index
b38a8be
..
caac453
100644
(file)
--- a/
cloudcms/forms.py
+++ b/
cloudcms/forms.py
@@
-23,6
+23,9
@@
from feincms.content.raw.models import RawContent
logger = logging.getLogger('cloudcms.rstimport')
logger = logging.getLogger('cloudcms.rstimport')
+def slugify(title):
+ return title[:90]
+
# base filename to service slug map
DEFAULT_SERVICE_MAP = {
'cyclades':'cyclades',
# base filename to service slug map
DEFAULT_SERVICE_MAP = {
'cyclades':'cyclades',
@@
-46,7
+49,7
@@
RESIZE_GEOMETRY = getattr(settings, 'CMS_RST_IMPORT_RESIZE_GEOMETRY',
def service_from_filename(rst):
fname = os.path.basename(rst).replace(".rst","")
def service_from_filename(rst):
fname = os.path.basename(rst).replace(".rst","")
- service_slug = DEFAULT_SERVICE_MAP.get(fname, None)
+ service_slug = SERVICE_MAP.get(fname, None)
if not service_slug:
return None
if not service_slug:
return None
@@
-145,7
+148,10
@@
class RstZipImportForm(forms.Form):
logger.warning("Removing exising entries")
self.clean_existing_data()
except Exception, e:
logger.warning("Removing exising entries")
self.clean_existing_data()
except Exception, e:
- transaction.savepoint_rollback(sid)
+ try:
+ transaction.savepoint_rollback(sid)
+ except Exception, e:
+ logger.exception("Can not rollback")
logger.exception("Failed to clean existing data")
logger.removeHandler(stream_handler)
logger.setLevel(old_level)
logger.exception("Failed to clean existing data")
logger.removeHandler(stream_handler)
logger.setLevel(old_level)
@@
-204,15
+210,25
@@
class RstZipImportForm(forms.Form):
except Exception, e:
except Exception, e:
- print e
+ print e, "EXCEPTION"
logger.exception("RST import failed")
logger.removeHandler(stream_handler)
logger.setLevel(old_level)
logger.exception("RST import failed")
logger.removeHandler(stream_handler)
logger.setLevel(old_level)
- transaction.savepoint_rollback(sid)
+ try:
+ transaction.savepoint_rollback(sid)
+ transaction.rollback()
+ except Exception, e:
+ logger.exception("Can not rollback")
+
return False, stream.getvalue()
if dry_run:
return False, stream.getvalue()
if dry_run:
- transaction.savepoint_rollback(sid)
+ try:
+ transaction.savepoint_rollback(sid)
+ transaction.rollback()
+ except Exception, e:
+ logger.exception("Can not rollback")
+
else:
transaction.savepoint_commit(sid)
else:
transaction.savepoint_commit(sid)
@@
-273,9
+289,10
@@
def add_or_update_faq_question(author, service, category, slug,\
q.is_active = True
q.category = category
q.service = service
q.is_active = True
q.category = category
q.service = service
- q.slug = slug
+ q.slug = slugify(slug)
q.title = unicode(title)
q.save()
q.title = unicode(title)
q.save()
+
q.application = [Application.current()]
q.save()
q.application = [Application.current()]
q.save()
@@
-303,7
+320,7
@@
def add_or_update_guide_entry(author, service, slug, title, html_content):
guide.author = author
guide.is_active = True
guide.service = service
guide.author = author
guide.is_active = True
guide.service = service
- guide.slug = slug
+ guide.slug = slugify(slug)
guide.title = unicode(title)
guide.save()
guide.title = unicode(title)
guide.save()