From 29a4f5114f1312e029ba7ed25cb5af4c503b2744 Mon Sep 17 00:00:00 2001
From: "Gary W. Smith" <gary.w.smith@hp.com>
Date: Wed, 8 Apr 2015 17:10:28 -0700
Subject: [PATCH] Incoporate get_item filter

---
 horizon/utils/filters.py                   | 68 ----------------------
 manila_ui/dashboards/admin/shares/views.py |  3 +
 manila_ui/utils/__init__.py                |  0
 manila_ui/utils/filters.py                 | 21 +++++++
 4 files changed, 24 insertions(+), 68 deletions(-)
 delete mode 100644 horizon/utils/filters.py
 create mode 100644 manila_ui/utils/__init__.py
 create mode 100644 manila_ui/utils/filters.py

diff --git a/horizon/utils/filters.py b/horizon/utils/filters.py
deleted file mode 100644
index 2404c417..00000000
--- a/horizon/utils/filters.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2012 Nebula, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import datetime
-
-import iso8601
-
-from django.template.defaultfilters import register  # noqa
-from django.template.defaultfilters import timesince  # noqa
-from django.utils.safestring import mark_safe
-from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-
-
-@register.filter
-def replace_underscores(string):
-    return string.replace("_", " ")
-
-
-@register.filter
-def parse_isotime(timestr, default=None):
-    """This duplicates oslo timeutils parse_isotime but with a
-    @register.filter annotation and a silent fallback on error.
-    """
-    try:
-        return iso8601.parse_date(timestr)
-    except (iso8601.ParseError, TypeError):
-        return default or ''
-
-
-@register.filter
-def timesince_or_never(dt, default=None):
-    """Call the Django ``timesince`` filter, but return the string
-    *default* if *dt* is not a valid ``date`` or ``datetime`` object.
-    When *default* is None, "Never" is returned.
-    """
-    if default is None:
-        default = _("Never")
-
-    if isinstance(dt, datetime.date):
-        return timesince(dt)
-    else:
-        return default
-
-
-@register.filter
-def timesince_sortable(dt):
-    delta = timezone.now() - dt
-    # timedelta.total_seconds() not supported on python < 2.7
-    seconds = delta.seconds + (delta.days * 24 * 3600)
-    return mark_safe("<span data-seconds=\"%d\">%s</span>" %
-                     (seconds, timesince(dt)))
-
-
-@register.filter
-def get_item(dictionary, key):
-    return dictionary.get(key)
diff --git a/manila_ui/dashboards/admin/shares/views.py b/manila_ui/dashboards/admin/shares/views.py
index 59a278d9..64a8df2f 100644
--- a/manila_ui/dashboards/admin/shares/views.py
+++ b/manila_ui/dashboards/admin/shares/views.py
@@ -30,6 +30,9 @@ from manila_ui.api import manila
 from manila_ui.dashboards.admin.shares import forms as project_forms
 from manila_ui.dashboards.admin.shares import tabs as project_tabs
 from manila_ui.dashboards.project.shares.shares import views as share_views
+from manila_ui.utils import filters
+
+filters = (filters.get_item,)
 
 
 class IndexView(tabs.TabbedTableView, share_views.ShareTableMixIn):
diff --git a/manila_ui/utils/__init__.py b/manila_ui/utils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/manila_ui/utils/filters.py b/manila_ui/utils/filters.py
new file mode 100644
index 00000000..5f0edf66
--- /dev/null
+++ b/manila_ui/utils/filters.py
@@ -0,0 +1,21 @@
+# Copyright 2012 Nebula, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+from django.template.defaultfilters import register  # noqa
+
+
+@register.filter
+def get_item(dictionary, key):
+    return dictionary.get(key)