Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GeoInt_SIDT
Project
Project
Details
Activity
Releases
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
Mario Chirinos Colunga
GeoInt_SIDT
Commits
972a5447
Commit
972a5447
authored
Jan 30, 2019
by
José Luis Uc
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev
parents
d377bc44
4e827166
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
urls.py
GeoInt_SIDT/urls.py
+2
-1
base_top.html
catalog/templates/base_top.html
+1
-1
views.py
catalog/views.py
+6
-1
No files found.
GeoInt_SIDT/urls.py
View file @
972a5447
...
...
@@ -27,4 +27,5 @@ urlpatterns = [
url
(
r'^reports/'
,
include
(
'reports.urls'
)),
url
(
r'^$'
,
RedirectView
.
as_view
(
url
=
'/catalog/'
,
permanent
=
True
)),
url
(
r'^accounts/'
,
include
(
'django.contrib.auth.urls'
)),
]
+
static
(
settings
.
STATIC_URL
,
document_root
=
settings
.
STATIC_ROOT
)
]
#+ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
catalog/templates/base_top.html
View file @
972a5447
...
...
@@ -26,7 +26,7 @@
<div
class=
"wrmapper"
>
<header
class=
"main-header"
>
<!-- Logo -->
<a
href=
"index2.html"
class=
"logo"
>
<a
class=
"logo"
>
<!-- mini logo for sidebar mini 50x50 pixels -->
<span
class=
"logo-mini"
><b>
G
</b>
eo
</span>
<!-- logo for regular state and mobile devices -->
...
...
catalog/views.py
View file @
972a5447
...
...
@@ -49,6 +49,7 @@ def requestToImage(request):
img_link
=
request
.
GET
[
'value'
]
r
=
requests
.
get
(
img_link
,
auth
=
(
"emmhp"
,
"geoemm29"
),
stream
=
True
)
img_str
=
base64
.
b64encode
(
r
.
content
)
img_str
=
img_str
.
decode
(
'utf-8'
)
return
JsonResponse
({
'img'
:
img_str
})
...
...
@@ -89,8 +90,12 @@ def productList(request):
catalog
=
[]
for
p
in
products
:
# img_link = products[p]['link_icon']
# img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]
# img_link = img_link[:img_link.find("/")+2] + "emmhp:geoemm29@" + img_link[img_link.find("/")+2:]
if
products
[
p
]
.
get
(
'tileid'
)
is
None
:
titleid
=
products
[
p
][
'title'
]
.
split
(
"_"
)
products
[
p
][
'tileid'
]
=
titleid
[
5
][
1
:]
catalog
.
append
({
'process'
:
process
,
'start_date'
:
init_date
,
...
...
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