Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branchs_developer

app/code/Joshine/InstagramFeed/Model/Cache/Type.php

@@ -10,7 +10,7 @@ class Type extends TagScope
 
 
     const CACHE_TAG = 'INSTAGRAM_FEED';
     const CACHE_TAG = 'INSTAGRAM_FEED';
 
 
-    const CACHE_LIFETIME = 60 * 60;
+    const CACHE_LIFETIME = 60 * 60 * 24;
 
 
     /**
     /**
      * @param FrontendPool $cacheFrontendPool
      * @param FrontendPool $cacheFrontendPool

app/code/Magepow/Sizechart/Block/Adminhtml/Sizechart/AddRow.php

@@ -21,7 +21,7 @@ class AddRow extends \Magento\Backend\Block\Widget\Form\Container
         $this->_blockGroup = 'Magepow_Sizechart';
         $this->_blockGroup = 'Magepow_Sizechart';
         $this->_controller = 'adminhtml_sizechart';
         $this->_controller = 'adminhtml_sizechart';
         parent::_construct();
         parent::_construct();
-        if ($this->_isAllowedAction('Magepow_Sizechart::add_row')) {
+        /*if ($this->_isAllowedAction('Magepow_Sizechart::add_row')) {
             $this->buttonList->update('save', 'label', __('Save'));
             $this->buttonList->update('save', 'label', __('Save'));
             $this->buttonList->add(
             $this->buttonList->add(
                 'saveandcontinue',
                 'saveandcontinue',
@@ -40,7 +40,23 @@ class AddRow extends \Magento\Backend\Block\Widget\Form\Container
             );
             );
         } else {
         } else {
             $this->buttonList->remove('save');
             $this->buttonList->remove('save');
-        }
+        }*/
+        $this->buttonList->update('save', 'label', __('Save'));
+        $this->buttonList->add(
+            'saveandcontinue',
+            [
+                'label' => __('Save and Continue Edit'),
+                'class' => 'save',
+                'data_attribute' => [
+                    'mage-init' => [
+                        'button' => [
+                            'event' => 'saveAndContinueEdit',
+                            'target' => '#edit_form'
+                        ]
+                    ]
+                ]
+            ]
+        );
         // $this->buttonList->remove('reset');
         // $this->buttonList->remove('reset');
 
 
     }
     }

app/code/Magepow/Sizechart/etc/acl.xml

+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+<acl>
+    <resources>
+        <resource id="Magento_Backend::admin">
+            <resource id="Magepow_Sizechart::magepow" title="Size Chart" sortOrder="10">
+                <resource id="Magepow_Sizechart::sizechart" title="Size Chart Management" sortOrder="50" />
+            </resource>
+            <resource id="Magento_Backend::stores">
+                <resource id="Magento_Backend::stores_settings">
+                    <resource id="Magento_Config::config">
+                        <resource id="Magepow_Sizechart::config" title="Size Chart"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+</acl>
+</config>
\ No newline at end of file