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
d7f13b9a
Commit
d7f13b9a
authored
Jun 22, 2017
by
Vasyl Bodnaruk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log view
parent
70676a46
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
views.py
esi/scraper/views.py
+1
-3
tables.js
esi/static/js/tables.js
+1
-1
job_list.html
esi/templates/job_list.html
+1
-0
No files found.
esi/scraper/views.py
View file @
d7f13b9a
...
...
@@ -18,7 +18,6 @@ class JobListView(ListView):
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
self
.
service
.
update_jobs_status
()
j
=
Job
.
objects
.
all
()
.
order_by
(
'-create_time'
)
print
(
"NOOOOOT"
)
if
request
.
is_ajax
():
action
=
request
.
GET
.
get
(
'action'
)
job_id
=
request
.
GET
.
get
(
'id'
)
...
...
@@ -32,12 +31,12 @@ class JobListView(ListView):
}
return
render
(
request
,
self
.
template_name
,
{
'jobs'
:
jobs
})
@
csrf_exempt
def
post
(
self
,
request
,
*
args
,
**
kwargs
):
if
request
.
is_ajax
():
action
=
request
.
POST
.
get
(
'action'
)
job_id
=
request
.
POST
.
get
(
'id'
)
return
self
.
_logic
(
action
,
job_id
)
return
HttpResponseRedirect
(
reverse
(
'job_list'
))
def
_logic
(
self
,
action
,
job_id
):
if
action
==
'run'
:
...
...
@@ -57,7 +56,6 @@ class JobListView(ListView):
if
action
==
'log'
:
log
=
self
.
service
.
get_log
(
job_id
)
return
HttpResponse
(
log
,
content_type
=
'text/plain'
)
return
HttpResponseRedirect
(
reverse
(
'job_list'
))
class
NewJobCreateView
(
CreateView
):
...
...
esi/static/js/tables.js
View file @
d7f13b9a
...
...
@@ -198,7 +198,7 @@
url
:
AJAX_URL
,
cache
:
false
,
contentType
:
"application/json; charset=utf-8"
,
//
headers: { 'X-CSRFToken': $.cookie('csrftoken') },
headers
:
{
'X-CSRFToken'
:
$
.
cookie
(
'csrftoken'
)
},
data
:
data
,
success
:
success
,
error
:
error
...
...
esi/templates/job_list.html
View file @
d7f13b9a
...
...
@@ -217,6 +217,7 @@
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"
integrity=
"sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb"
crossorigin=
"anonymous"
></script>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"
></script>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/axios/0.16.2/axios.min.js"
></script>
<script
src=
"{% static 'js/highlight.pack.js' %}"
></script>
<script
src=
"{% static 'js/dateformat.js' %}"
></script>
...
...
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