move subscription API path to /nodes

This aligns it with PVE and allows the widget toolkit's update window
"refresh" to work without modifications once POST /apt/update is
implemented.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-07-21 13:41:06 +02:00 committed by Thomas Lamprecht
parent 956295cefe
commit 113c9b5981
5 changed files with 12 additions and 4 deletions

View File

@ -4,7 +4,6 @@ pub mod backup;
pub mod config; pub mod config;
pub mod node; pub mod node;
pub mod reader; pub mod reader;
mod subscription;
pub mod status; pub mod status;
pub mod types; pub mod types;
pub mod version; pub mod version;
@ -26,7 +25,6 @@ pub const SUBDIRS: SubdirMap = &[
("pull", &pull::ROUTER), ("pull", &pull::ROUTER),
("reader", &reader::ROUTER), ("reader", &reader::ROUTER),
("status", &status::ROUTER), ("status", &status::ROUTER),
("subscription", &subscription::ROUTER),
("version", &version::ROUTER), ("version", &version::ROUTER),
]; ];

View File

@ -9,6 +9,7 @@ mod syslog;
mod journal; mod journal;
mod services; mod services;
mod status; mod status;
mod subscription;
pub(crate) mod rrd; pub(crate) mod rrd;
pub mod disks; pub mod disks;
@ -20,6 +21,7 @@ pub const SUBDIRS: SubdirMap = &[
("rrd", &rrd::ROUTER), ("rrd", &rrd::ROUTER),
("services", &services::ROUTER), ("services", &services::ROUTER),
("status", &status::ROUTER), ("status", &status::ROUTER),
("subscription", &subscription::ROUTER),
("syslog", &syslog::ROUTER), ("syslog", &syslog::ROUTER),
("tasks", &tasks::ROUTER), ("tasks", &tasks::ROUTER),
("time", &time::ROUTER), ("time", &time::ROUTER),

View File

@ -5,8 +5,16 @@ use proxmox::api::{api, Router, Permission};
use crate::tools; use crate::tools;
use crate::config::acl::PRIV_SYS_AUDIT; use crate::config::acl::PRIV_SYS_AUDIT;
use crate::api2::types::NODE_SCHEMA;
#[api( #[api(
input: {
properties: {
node: {
schema: NODE_SCHEMA,
},
},
},
returns: { returns: {
description: "Subscription status.", description: "Subscription status.",
properties: { properties: {

View File

@ -209,7 +209,7 @@ Ext.define('PBS.Dashboard', {
autoDestroy: true, autoDestroy: true,
proxy: { proxy: {
type: 'proxmox', type: 'proxmox',
url: '/api2/json/subscription' url: '/api2/json/nodes/localhost/subscription'
}, },
listeners: { listeners: {
load: 'updateSubscription' load: 'updateSubscription'

View File

@ -37,7 +37,7 @@ Ext.define('PBS.Subscription', {
me.rstore.load(); me.rstore.load();
}; };
var baseurl = '/subscription'; var baseurl = '/nodes/localhost/subscription';
var render_status = function(value) { var render_status = function(value) {