Revert "TT#45960 disable timesets web ui in 7.0"

This reverts commit e55e4a8336.

Change-Id: If70f2e172d23026e48a75427f261522c6348efde

lib/NGCP/Panel/Controller/Peering.pm

@@ -28,7 +28,7 @@ sub group_list :Chained('/') :PathPart('peering') :CaptureArgs(0) {
         { name => 'name', search => 1, title => $c->loc('Name') },
         { name => 'priority', search => 1, title => $c->loc('Priority') },
         { name => 'description', search => 1, title => $c->loc('Description') },
-        #{ name => 'time_set.name', search => 0, title => $c->loc('Time Set') },
+        { name => 'time_set.name', search => 0, title => $c->loc('Time Set') },
     ]);
     
     $c->stash(template => 'peering/list.tt');
@@ -132,7 +132,7 @@ sub edit :Chained('base') :PathPart('edit') {
         c => $c, form => $form,
         fields => {
             'contract.create' => $c->uri_for('/contract/peering/create'),
-            #'time_set.create' => $c->uri_for('/timeset/create'),
+            'time_set.create' => $c->uri_for('/timeset/create'),
         },
         back_uri => $c->req->uri,
     );
@@ -203,7 +203,7 @@ sub create :Chained('group_list') :PathPart('create') :Args(0) {
         c => $c, form => $form,
         fields => {
             'contract.create' => $c->uri_for('/contract/peering/create'),
-            #'time_set.create' => $c->uri_for('/timeset/create'),
+            'time_set.create' => $c->uri_for('/timeset/create'),
         },
         back_uri => $c->req->uri,
     );

lib/NGCP/Panel/Form/Peering/Group.pm

@@ -32,14 +32,14 @@ has_field 'priority' => (
     range_end => '9',
 );
 
-#has_field 'time_set' => (
-#    type => '+NGCP::Panel::Field::TimeSet',
-#    #validate_when_empty => 1,
-#    element_attr => {
-#        rel => ['tooltip'],
-#        title => ['By specifying a TimeSet the periods during which this group is active can be restricted.']
-#    },
-#);
+has_field 'time_set' => (
+    type => '+NGCP::Panel::Field::TimeSet',
+    #validate_when_empty => 1,
+    element_attr => {
+        rel => ['tooltip'],
+        title => ['By specifying a TimeSet the periods during which this group is active can be restricted.']
+    },
+);
 
 has_field 'description' => (
     type => 'Text',
@@ -56,8 +56,7 @@ has_field 'save' => (
 has_block 'fields' => (
     tag => 'div',
     class => [qw/modal-body/],
-#    render_list => [qw/id contract name priority time_set description/],
-    render_list => [qw/id contract name priority description/],
+    render_list => [qw/id contract name priority time_set description/],
 );
 
 has_block 'actions' => (

share/templates/reseller/details.tt

@@ -439,45 +439,42 @@
             </div>
         </div>
     </div>
-[%
-#    <div class="accordion-group">
-#        <div class="accordion-heading">
-#            <a class="accordion-toggle" data-toggle="collapse" data-parent="#reseller_details" href="#collapse_timeset">[% c.loc('Time sets') 
-%]
-[%
-#</a>
-#        </div>
-#        <div class="accordion-body collapse" id="collapse_timeset">
-#            <div class="accordion-inner">
-%]
-[%
-#    helper.name = c.loc('Time sets');
-#    helper.identifier = "TimeSets";
-#    helper.dt_columns = timeset_dt_columns;
-#    helper.messages = messages;
-#    helper.close_target = close_target;
-#    helper.create_flag = create_flag;
-#    helper.edit_flag = edit_flag;
-#    helper.form_object = form;
-#    helper.ajax_uri = c.uri_for_action('/reseller/timeset_ajax', [c.req.captures.0] );
-#    helper.tmpuri = c.uri_for(reseller.first.id, 'timeset');
-#    UNLESS c.user.read_only;
-#        helper.dt_buttons = [
-#            { name = c.loc('Edit'), uri = helper.tmpuri _ "/'+full.id+'/edit", class = 'btn-small btn-tertiary', icon = 'icon-edit' },
-#            { name = c.loc('Delete'), uri =  helper.tmpuri _ "/'+full.id+'/delete", class = 'btn-small btn-secondary', icon = 'icon-remove' },
-#        ];
-#        helper.top_buttons = [
-#            { name = c.loc('Create Time Set'), uri = c.uri_for_action('/reseller/timeset_create', [c.req.captures.0]), class = 'btn-small btn-primary', icon = 'icon-star' },
-#        ];
-#    END;
-#    PROCESS 'helpers/datatables.tt';
-%]
 
+    <div class="accordion-group">
+        <div class="accordion-heading">
+            <a class="accordion-toggle" data-toggle="collapse" data-parent="#reseller_details" href="#collapse_timeset">[% c.loc('Time sets') %]</a>
+        </div>
+        <div class="accordion-body collapse" id="collapse_timeset">
+            <div class="accordion-inner">
 [%
-#            </div>
-#        </div>
-#    </div>
-%]
+    helper.name = c.loc('Time sets');
+    helper.identifier = "TimeSets";
+    helper.dt_columns = timeset_dt_columns;
+    helper.messages = messages;
+    helper.close_target = close_target;
+    helper.create_flag = create_flag;
+    helper.edit_flag = edit_flag;
+    helper.form_object = form;
+    helper.ajax_uri = c.uri_for_action('/reseller/timeset_ajax', [c.req.captures.0] );
+    helper.tmpuri = c.uri_for(reseller.first.id, 'timeset');
+
+    UNLESS c.user.read_only;
+        helper.dt_buttons = [
+            { name = c.loc('Edit'), uri = helper.tmpuri _ "/'+full.id+'/edit", class = 'btn-small btn-tertiary', icon = 'icon-edit' },
+            { name = c.loc('Delete'), uri =  helper.tmpuri _ "/'+full.id+'/delete", class = 'btn-small btn-secondary', icon = 'icon-remove' },
+        ];
+        helper.top_buttons = [
+            { name = c.loc('Create Time Set'), uri = c.uri_for_action('/reseller/timeset_create', [c.req.captures.0]), class = 'btn-small btn-primary', icon = 'icon-star' },
+        ];
+    END;
+
+    PROCESS 'helpers/datatables.tt';
+-%]
+
+
+            </div>
+        </div>
+    </div>
 
     [% END -%]
 

share/templates/widgets/admin_topmenu_settings.tt

@@ -82,7 +82,7 @@
         <li><a href="[% c.uri_for('/lnp') %]">[% c.loc('Number Porting') %]</a></li>
         <li><a href="[% c.uri_for('/emergencymapping') %]">[% c.loc('Emergency Mappings') %]</a></li>
         <li><a href="[% c.uri_for('/phonebook') %]">[% c.loc('Phonebook') %]</a></li>
-        <!--li><a href="[% c.uri_for('/timeset') %]">[% c.loc('Time Sets') %]</a></li-->
+        <li><a href="[% c.uri_for('/timeset') %]">[% c.loc('Time Sets') %]</a></li>
     </ul>
 </li>
 [% # vim: set tabstop=4 syntax=html expandtab: -%]