|
@@ -245,7 +245,7 @@ class Entry(object):
|
|
@property
|
|
@property
|
|
def permalink(self):
|
|
def permalink(self):
|
|
if self.kind == 'page':
|
|
if self.kind == 'page':
|
|
- dest = '%s.html' % self.title.replace('/', "-")
|
|
|
|
|
|
+ dest = '%s.html' % self._path.replace('.md', "")
|
|
else:
|
|
else:
|
|
dest = "%s/%s/index.html" % (KINDS[self.kind]['name_plural'], self.name)
|
|
dest = "%s/%s/index.html" % (KINDS[self.kind]['name_plural'], self.name)
|
|
dest = dest.lstrip('/')
|
|
dest = dest.lstrip('/')
|
|
@@ -301,7 +301,7 @@ class Entry(object):
|
|
context = GLOBAL_TEMPLATE_CONTEXT.copy()
|
|
context = GLOBAL_TEMPLATE_CONTEXT.copy()
|
|
context['entry'] = self
|
|
context['entry'] = self
|
|
_render(context, self.header.get('template', 'entry.html'),
|
|
_render(context, self.header.get('template', 'entry.html'),
|
|
- self.destination)
|
|
|
|
|
|
+ self.header.get('template', self.destination))
|
|
return True
|
|
return True
|
|
except Exception as e: # pragma: no cover
|
|
except Exception as e: # pragma: no cover
|
|
print(context)
|
|
print(context)
|