Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
E
esi-table-data
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
esi-data-scrapping
esi-table-data
Commits
605b89e2
Commit
605b89e2
authored
Jun 02, 2017
by
Vasyl Bodnaruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add functional for adding new News
parent
8aeeaf06
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
17 deletions
+21
-17
list_news.html
esi/templates/list_news.html
+1
-2
forms.py
esi/webapp/forms.py
+0
-1
news.py
esi/webapp/models/news.py
+12
-11
urls.py
esi/webapp/urls.py
+3
-2
views.py
esi/webapp/views.py
+5
-1
No files found.
esi/templates/list_news.html
View file @
605b89e2
...
...
@@ -31,7 +31,7 @@
</form>
</div>
<div>
<a
href=
"
/
"
class=
"btn btn-primary"
>
Add
</a>
<a
href=
"
{% url 'add_news' %}
"
class=
"btn btn-primary"
>
Add
</a>
<button
class=
"js-delete-items btn btn-danger"
>
<span>
Delete(
</span><span
class=
"actions-counter"
>
0
</span><span>
)
</span>
</button>
...
...
@@ -50,7 +50,6 @@
<thead
class=
"thead-inverse"
>
<tr>
<th>
<span><input
id=
"select-all"
type=
"checkbox"
></span>
<span>
Title
</span>
</th>
<th><a
href=
"?order_by=media_id{% if request.GET.order_by == 'media_id' and request.GET.reverse != '1' %}&reverse=1{% endif %}"
>
...
...
esi/webapp/forms.py
View file @
605b89e2
...
...
@@ -30,7 +30,6 @@ class NewsUpdate(forms.Form):
if
self
.
data
[
'region'
]:
news
.
region_id
=
self
.
data
[
'region'
]
if
self
.
data
[
'date'
]:
print
(
self
.
data
[
'date'
])
news
.
publish_date
=
datetime
.
strptime
(
self
.
data
[
'date'
],
'
%
Y-
%
m-
%
d'
)
if
self
.
data
[
'tags'
]:
...
...
esi/webapp/models/news.py
View file @
605b89e2
import
json
from
datetime
import
datetime
from
django.db
import
models
from
.wp
import
WpEsiMedia
,
WpEsiEntity
,
WpEsiType
,
WpEsiRegion
,
WpEsiNewsEntity
,
WpEsiNews
,
WpEsiRadar
,
WpEsiIndustry
,
\
WpEsiFunction
,
WpEsiTechnology
,
WpEsiTag
...
...
@@ -6,17 +7,17 @@ from .wp import WpEsiMedia, WpEsiEntity, WpEsiType, WpEsiRegion, WpEsiNewsEntity
class
News
(
models
.
Model
):
title
=
models
.
CharField
(
max_length
=
255
)
url
=
models
.
TextField
(
max_length
=
2083
)
description
=
models
.
TextField
()
media_id
=
models
.
IntegerField
()
type_id
=
models
.
IntegerField
()
region_id
=
models
.
IntegerField
()
post_id
=
models
.
BigIntegerField
()
publish_date
=
models
.
DateTimeField
()
record_date
=
models
.
DateTimeField
()
company_id
=
models
.
BigIntegerField
()
title
=
models
.
CharField
(
max_length
=
255
,
default
=
None
,
null
=
True
,
blank
=
True
)
url
=
models
.
TextField
(
max_length
=
2083
,
default
=
None
,
null
=
True
,
blank
=
True
)
description
=
models
.
TextField
(
default
=
None
,
null
=
True
,
blank
=
True
)
media_id
=
models
.
IntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
type_id
=
models
.
IntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
region_id
=
models
.
IntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
post_id
=
models
.
BigIntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
publish_date
=
models
.
DateTimeField
(
default
=
datetime
.
now
,
null
=
True
,
blank
=
True
)
record_date
=
models
.
DateTimeField
(
default
=
None
,
null
=
True
,
blank
=
True
)
company_id
=
models
.
BigIntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
is_accepted
=
models
.
BooleanField
(
default
=
False
)
radar_id
=
models
.
BigIntegerField
(
default
=
None
,
null
=
True
,
blank
=
True
)
...
...
esi/webapp/urls.py
View file @
605b89e2
from
django.conf.urls
import
url
from
.views
import
ListNewsView
,
EditNewsView
,
ViewNewsView
from
.views
import
ListNewsView
,
EditNewsView
,
ViewNewsView
,
add
from
.autocomplete
import
*
...
...
@@ -7,5 +7,6 @@ urlpatterns = [
url
(
r'^$'
,
ListNewsView
.
as_view
(),
name
=
'list_news'
),
url
(
r'^(?P<id>[0-9]+)$'
,
EditNewsView
.
as_view
(),
name
=
'edit_news'
),
url
(
r'^view/(?P<id>[0-9]+)$'
,
ViewNewsView
.
as_view
(),
name
=
'view_news'
),
url
(
r'^auto/(?P<slug>\w+)$'
,
auto
,
name
=
'auto'
)
url
(
r'^auto/(?P<slug>\w+)$'
,
auto
,
name
=
'auto'
),
url
(
r'^add/$'
,
add
,
name
=
'add_news'
)
]
\ No newline at end of file
esi/webapp/views.py
View file @
605b89e2
...
...
@@ -95,7 +95,6 @@ class EditNewsView(DetailView):
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
radar
=
request
.
POST
.
get
(
'cancel'
)
print
(
radar
)
form
=
NewsUpdate
(
request
.
POST
)
if
form
.
is_valid
():
form
.
update
()
...
...
@@ -127,3 +126,8 @@ class ViewNewsView(DetailView):
news
.
export_news
()
return
HttpResponseRedirect
(
reverse
(
'view_news'
,
kwargs
=
{
'id'
:
export_news
}))
def
add
(
request
):
news
=
News
()
news
.
save
()
return
HttpResponseRedirect
(
reverse
(
'edit_news'
,
kwargs
=
{
'id'
:
news
.
id
}))
\ No newline at end of file
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