Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
flask-admin
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
JIRA
JIRA
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Python-Dev
flask-admin
Commits
f022e70a
Commit
f022e70a
authored
Aug 11, 2014
by
boomard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed bootstrap3 datetime filters to be compatible in same way as issue #603
parent
dfe09ce5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
filters.js
flask_admin/static/admin/js/filters.js
+3
-0
form.js
flask_admin/static/admin/js/form.js
+1
-1
layout.html
flask_admin/templates/bootstrap3/admin/model/layout.html
+1
-1
No files found.
flask_admin/static/admin/js/filters.js
View file @
f022e70a
...
@@ -96,6 +96,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) {
...
@@ -96,6 +96,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) {
if
(
filter
.
type
==
"datepicker"
)
{
if
(
filter
.
type
==
"datepicker"
)
{
$field
.
attr
(
'data-date-format'
,
"YYYY-MM-DD"
);
$field
.
attr
(
'data-date-format'
,
"YYYY-MM-DD"
);
}
}
else
if
(
filter
.
type
==
"datetimepicker"
)
{
$field
.
attr
(
'data-date-format'
,
"YYYY-MM-DD hh:mm:ss"
);
}
faForm
.
applyStyle
(
$field
,
filter
.
type
);
faForm
.
applyStyle
(
$field
,
filter
.
type
);
}
}
}
}
...
...
flask_admin/static/admin/js/form.js
View file @
f022e70a
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
return
true
;
return
true
;
case
'datetimepicker'
:
case
'datetimepicker'
:
$el
.
datetimepicker
({
$el
.
datetimepicker
({
format
:
'YYYY-MM-DD hh:mm:ss'
//
format: 'YYYY-MM-DD hh:mm:ss'
});
});
return
true
;
return
true
;
case
'timepicker'
:
case
'timepicker'
:
...
...
flask_admin/templates/bootstrap3/admin/model/layout.html
View file @
f022e70a
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
{%- endfor %}
{%- endfor %}
</select>
</select>
{%- else -%}
{%- else -%}
<input
name=
"flt{{n}}_{{ filter_arg }}"
type=
"text"
value=
"{{ value or '' }}"
class=
"filter-val form-control"
{%
if
filter
.
data_type
%}
data-role=
"{{ filter.data_type }}"
{%
endif
%}
{%
if
filter
.
data_type =
=
"
datepicker
"
%}
data-date-format=
"YYYY-MM-DD"
{%
endif
%}
></input>
<input
name=
"flt{{n}}_{{ filter_arg }}"
type=
"text"
value=
"{{ value or '' }}"
class=
"filter-val form-control"
{%
if
filter
.
data_type
%}
data-role=
"{{ filter.data_type }}"
{%
endif
%}
{%
if
filter
.
data_type =
=
"
datepicker
"
%}
data-date-format=
"YYYY-MM-DD"
{%
e
lif
filter
.
data_type =
=
"
datetimepicker
"
%}
data-date-format=
"YYYY-MM-DD hh:mm:ss"
{%
e
ndif
%}
></input>
{%- endif -%}
{%- endif -%}
</td>
</td>
</tr>
</tr>
...
...
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