Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Sith
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
59
Issues
59
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AE
Sith
Commits
4954c610
Commit
4954c610
authored
Jan 15, 2017
by
Skia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add basic rights to weekmail
parent
ae0b7699
Pipeline
#731
passed with stage
in 2 minutes and 56 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
com/models.py
com/models.py
+6
-1
com/views.py
com/views.py
+6
-6
No files found.
com/models.py
View file @
4954c610
...
...
@@ -84,7 +84,6 @@ class Weekmail(models.Model):
def
send
(
self
):
dest
=
[
i
[
0
]
for
i
in
Preferences
.
objects
.
filter
(
receive_weekmail
=
True
).
values_list
(
'user__email'
)]
print
(
dest
)
with
transaction
.
atomic
():
email
=
EmailMultiAlternatives
(
subject
=
self
.
title
,
...
...
@@ -112,6 +111,9 @@ class Weekmail(models.Model):
def
__str__
(
self
):
return
"Weekmail %s (sent: %s) - %s"
%
(
self
.
id
,
self
.
sent
,
self
.
title
)
def
is_owned_by
(
self
,
user
):
return
user
.
is_in_group
(
settings
.
SITH_GROUP_COM_ADMIN_ID
)
class
WeekmailArticle
(
models
.
Model
):
weekmail
=
models
.
ForeignKey
(
Weekmail
,
related_name
=
"articles"
,
verbose_name
=
_
(
"weekmail"
),
null
=
True
)
title
=
models
.
CharField
(
_
(
"title"
),
max_length
=
64
)
...
...
@@ -120,3 +122,6 @@ class WeekmailArticle(models.Model):
club
=
models
.
ForeignKey
(
Club
,
related_name
=
"weekmail_articles"
,
verbose_name
=
_
(
"club"
))
rank
=
models
.
IntegerField
(
_
(
'rank'
),
default
=-
1
)
def
is_owned_by
(
self
,
user
):
return
user
.
is_in_group
(
settings
.
SITH_GROUP_COM_ADMIN_ID
)
com/views.py
View file @
4954c610
...
...
@@ -165,7 +165,7 @@ class NewsEditView(CanEditMixin, UpdateView):
Notification
(
user
=
u
,
url
=
reverse
(
"com:news_detail"
,
kwargs
=
{
'news_id'
:
self
.
object
.
id
}),
type
=
"NEWS_MODERATION"
).
save
()
return
super
(
NewsEditView
,
self
).
form_valid
(
form
)
class
NewsCreateView
(
CanCreateMixin
,
CreateView
):
class
NewsCreateView
(
CanCreateMixin
,
CreateView
):
#XXX no can_be_created_by function in News model
model
=
News
form_class
=
NewsForm
template_name
=
'com/news_edit.jinja'
...
...
@@ -232,7 +232,7 @@ class NewsDetailView(CanViewMixin, DetailView):
# Weekmail
class
WeekmailPreviewView
(
ComTabsMixin
,
DetailView
):
class
WeekmailPreviewView
(
ComTabsMixin
,
CanEditPropMixin
,
DetailView
):
model
=
Weekmail
template_name
=
'com/weekmail_preview.jinja'
success_url
=
reverse_lazy
(
'com:weekmail'
)
...
...
@@ -256,7 +256,7 @@ class WeekmailPreviewView(ComTabsMixin, DetailView):
kwargs
[
'weekmail_rendered'
]
=
self
.
object
.
render_html
()
return
kwargs
class
WeekmailEditView
(
ComTabsMixin
,
QuickNotifMixin
,
UpdateView
):
class
WeekmailEditView
(
ComTabsMixin
,
QuickNotifMixin
,
CanEditPropMixin
,
UpdateView
):
model
=
Weekmail
template_name
=
'com/weekmail.jinja'
fields
=
[
'title'
,
'intro'
,
'joke'
,
'protip'
,
'conclusion'
]
...
...
@@ -310,7 +310,7 @@ class WeekmailEditView(ComTabsMixin, QuickNotifMixin, UpdateView):
kwargs
[
'orphans'
]
=
WeekmailArticle
.
objects
.
filter
(
weekmail
=
None
)
return
kwargs
class
WeekmailArticleEditView
(
ComTabsMixin
,
QuickNotifMixin
,
UpdateView
):
class
WeekmailArticleEditView
(
ComTabsMixin
,
QuickNotifMixin
,
CanEditPropMixin
,
UpdateView
):
"""Edit an article"""
model
=
WeekmailArticle
fields
=
[
'title'
,
'content'
]
...
...
@@ -320,7 +320,7 @@ class WeekmailArticleEditView(ComTabsMixin, QuickNotifMixin, UpdateView):
quick_notif_url_arg
=
"qn_weekmail_article_edit"
current_tab
=
"weekmail"
class
WeekmailArticleCreateView
(
QuickNotifMixin
,
CreateView
):
class
WeekmailArticleCreateView
(
QuickNotifMixin
,
CreateView
):
#XXX need to protect this view
"""Post an article"""
model
=
WeekmailArticle
fields
=
[
'title'
,
'content'
]
...
...
@@ -334,7 +334,7 @@ class WeekmailArticleCreateView(QuickNotifMixin, CreateView):
form
.
instance
.
author
=
self
.
request
.
user
return
super
(
WeekmailArticleCreateView
,
self
).
form_valid
(
form
)
class
WeekmailArticleDeleteView
(
DeleteView
):
class
WeekmailArticleDeleteView
(
CanEditPropMixin
,
DeleteView
):
"""Delete an article"""
model
=
WeekmailArticle
template_name
=
'core/delete_confirm.jinja'
...
...
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