Revert to shortTime refs #1474

openhealthcare · Nov 12, 2018 · e34ab13 · e34ab13
1 parent 0617ec2
commit e34ab13
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/opal/scaffolding/record_templates/record_display.jinja2 b/opal/scaffolding/record_templates/record_display.jinja2
@@ -7,7 +7,7 @@
    {% elif f['type'] == 'date_time' %}
     [[ item.{{ f['name'] }} | displayDateTime ]]
    {% elif f['type'] == 'time' %}
-    [[ item.{{ f['name'] }} | hhmm ]]
+    [[ item.{{ f['name'] }} | shortTime ]]
    {% else %}
     [[ item.{{ f['name'] }} ]]
    {% endif %}

diff --git a/opal/static/js/opal/filters.js b/opal/static/js/opal/filters.js
@@ -97,9 +97,8 @@ filters.filter('shortDateTime', function(shortDateFilter, hhmmFilter, $log){
 });
 
 
-filters.filter('shortTime', function(shortDateFilter, hhmmFilter, $log){
+filters.filter('shortTime', function(shortDateFilter, hhmmFilter){
 	return function(input){
-      $log.warn('shortTime will be removed in Opal 0.14.0')
 	  var toChange;
 		if(_.isDate(input)){
 			toChange = moment(input);

diff --git a/opal/static/js/test/filters.test.js b/opal/static/js/test/filters.test.js
@@ -193,20 +193,13 @@ describe('filters', function() {
   });
 
   describe('shortTime', function(){
-    var shortTime, log;
+    var shortTime;
 
     beforeEach(function(){
       inject(function($injector){
         shortTime  = $injector.get('shortTimeFilter');
-        log  = $injector.get('$log');
       });
 
-      spyOn(log, 'warn');
-    });
-
-    it('should log a warning message', function() {
-      shortTime()
-      expect(log.warn).toHaveBeenCalledWith('shortTime will be removed in Opal 0.14.0')
     });
 
     it('should display the time as hh:mm from string', function(){

diff --git a/opal/tests/test_scaffold.py b/opal/tests/test_scaffold.py
@@ -357,7 +357,7 @@ def test_time_render(self, build_field_schema, lshift):
         scaffold_path = ffs.Path(settings.PROJECT_PATH)/'scaffolding'
         create_display_template_for(Colour, scaffold_path)
         lshift.assert_called_once_with(
-            '<span ng-show="item.name">\n    [[ item.name | hhmm ]]\n   <br />\n</span>'
+            '<span ng-show="item.name">\n    [[ item.name | shortTime ]]\n   <br />\n</span>'
         )
 
     @patch.object(Colour, "build_field_schema")