v0.3.28

fix: fix enable/disable functionality to podkop service

.github/workflows/build.yml

@@ -11,6 +11,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4.2.1
 
+      - name: Check version match
+        run: |
+          PODKOP_VERSION=$(grep '^PKG_VERSION:=' podkop/Makefile | cut -d '=' -f 2)
+          LUCI_APP_PODKOP_VERSION=$(grep '^PKG_VERSION:=' luci-app-podkop/Makefile | cut -d '=' -f 2)
+
+          TAG_VERSION=${GITHUB_REF#refs/tags/v}
+
+          echo "Podkop version: $PODKOP_VERSION"
+          echo "Luci-app-podkop version: $LUCI_APP_PODKOP_VERSION"
+          echo "Tag version: $TAG_VERSION"
+
+          if [ "$PODKOP_VERSION" != "$TAG_VERSION" ] || [ "$LUCI_APP_PODKOP_VERSION" != "$TAG_VERSION" ]; then
+            echo "Error: Version mismatch"
+            exit 1
+          fi
+
       - name: Build and push
         uses: docker/build-push-action@v6.9.0
         with:

luci-app-podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-podkop
-PKG_VERSION:=0.3.27
+PKG_VERSION:=0.3.28
 PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI podkop app

luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js

@@ -614,6 +614,16 @@ const ButtonFactory = {
         });
     },
 
+    createInitActionButton: function (config) {
+        return this.createButton({
+            label: config.label,
+            additionalClass: `cbi-button-${config.type || ''}`,
+            onClick: () => safeExec('/etc/init.d/podkop', [config.action])
+                .then(() => config.reload && location.reload()),
+            style: config.style
+        });
+    },
+
     createModalButton: function (config) {
         return this.createButton({
             label: config.label,
@@ -656,26 +666,19 @@ let createStatusSection = function (podkopStatus, singboxStatus, podkop, luci, s
         E('div', { 'class': 'table', style: 'display: flex; gap: 20px;' }, [
             // Podkop Status Panel
             createStatusPanel('Podkop Status', podkopStatus, [
-                podkopStatus.running ?
-                    ButtonFactory.createActionButton({
-                        label: 'Stop Podkop',
-                        type: 'remove',
-                        action: 'stop',
-                        reload: true
-                    }) :
-                    ButtonFactory.createActionButton({
-                        label: 'Start Podkop',
-                        type: 'apply',
-                        action: 'start',
-                        reload: true
-                    }),
+                ButtonFactory.createActionButton({
+                    label: podkopStatus.running ? 'Stop Podkop' : 'Start Podkop',
+                    type: podkopStatus.running ? 'remove' : 'apply',
+                    action: podkopStatus.running ? 'stop' : 'start',
+                    reload: true
+                }),
                 ButtonFactory.createActionButton({
                     label: 'Restart Podkop',
                     type: 'apply',
                     action: 'restart',
                     reload: true
                 }),
-                ButtonFactory.createActionButton({
+                ButtonFactory.createInitActionButton({
                     label: podkopStatus.enabled ? 'Disable Podkop' : 'Enable Podkop',
                     type: podkopStatus.enabled ? 'remove' : 'apply',
                     action: podkopStatus.enabled ? 'disable' : 'enable',

luci-app-podkop/po/ru/podkop.po

@@ -746,4 +746,7 @@ msgid "not works in browser"
 msgstr "не работает в браузере"
 
 msgid "not works on router"
-msgstr "не работает на роутере"
+msgstr "не работает на роутере"
+
+msgid "Diagnostics"
+msgstr "Диагностика"

luci-app-podkop/po/templates/podkop.pot

@@ -1100,4 +1100,7 @@ msgid "not works in browser"
 msgstr ""
 
 msgid "not works on router"
+msgstr ""
+
+msgid "Diagnostics"
 msgstr ""

podkop/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=podkop
-PKG_VERSION:=0.3.27
+PKG_VERSION:=0.3.28
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=ITDog <podkop@itdog.info>