Changes to 'refs/tags/spacewalk-schema-1.10.55-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.55-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-07-01 09:48 +0000
Tagging package [spacewalk-schema] version [1.10.55-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.10.33-1:
Michael Mraka (2):
fixed forgotten end loop
Automatic commit of package [spacewalk-schema] release [1.10.55-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/oracle/triggers/rhnConfigRevision.sql | 1 -
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
---
10 years, 3 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/oracle/triggers/rhnConfigRevision.sql | 1 -
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 8a1b99dd591cb156b6c8efe9b67a3a3471a8a85a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jul 1 11:48:54 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.55-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 6b8a034..e5115f2 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.54-1 schema/spacewalk/
+1.10.55-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 2ccde4b..254835d 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.54
+Version: 1.10.55
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Jul 01 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.55-1
+- fixed forgotten end loop
+
* Fri Jun 28 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.54-1
- mark unfinished taskomatic runs as INTERRUPTED
commit 611c0e6e3aa1e44bbc188493aaf0740ba8d2a606
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jul 1 11:47:00 2013 +0200
fixed forgotten end loop
diff --git a/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql b/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql
index f26885b..58f4c2e 100644
--- a/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql
+++ b/schema/spacewalk/oracle/triggers/rhnConfigRevision.sql
@@ -43,7 +43,6 @@ begin
and snapshot_id in (select snapshot_id
from rhnSnapshotConfigRevision
where config_revision_id = :old.id);
- end loop;
end;
/
show errors
diff --git a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
index 503a74c..0638e5b 100644
--- a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
+++ b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 54ce1d758b270102418b62da8393d992d5ff3552
+-- oracle equivalent source sha1 8a61ab7f325dd72c5dae04eca2b0910f881a1535
--
-- Copyright (c) 2008--2012 Red Hat, Inc.
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle
index eb6b5eb..70be6dc 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.oracle
@@ -15,7 +15,6 @@ begin
and snapshot_id in (select snapshot_id
from rhnSnapshotConfigRevision
where config_revision_id = :old.id);
- end loop;
end;
/
show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql
index f075070..d2d4fb3 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/026-rhnConfigRevision-triggers.sql.postgresql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 929649a1abb7046d77f1ca93f1f33401b180c6d6
+-- oracle equivalent source sha1 ffb038f506c05729c4d0ba8f62e514a1133a2c99
create or replace function rhn_confrevision_del_trig_fun() returns trigger
as
10 years, 3 months
Changes to 'refs/tags/spacewalk-web-1.10.33-1'
by Tomáš Kašpárek
Tag 'spacewalk-web-1.10.33-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-01 07:33 +0000
Tagging package [spacewalk-web] version [1.10.33-1] in directory [web/].
Changes since spacewalk-backend-1.10.53-1:
Tomas Kasparek (2):
979924 - fixing duplicate SSM, System List page
Automatic commit of package [spacewalk-web] release [1.10.33-1].
---
rel-eng/packages/spacewalk-web | 2 -
web/html/network/systems/ssm/system_list.pxt | 41 ---------------------------
web/modules/sniglets/Sniglets/ServerGroup.pm | 2 -
web/spacewalk-web.spec | 5 ++-
4 files changed, 6 insertions(+), 44 deletions(-)
---
10 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f5cb1b4f8a5be074d07d058e098afabf58507ae0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 1 09:33:32 2013 +0200
Automatic commit of package [spacewalk-web] release [1.10.33-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 136f94a..ca0b4b5 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.32-1 web/
+1.10.33-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7913d34..be9aba9 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.32
+Version: 1.10.33
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jul 01 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.33-1
+- 979924 - fixing duplicate SSM, System List page
+
* Thu Jun 20 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.32-1
- spacewalk-dobby: use the rhn_dobby.conf config file by default
- 815236 - add GNU General Public License
10 years, 3 months
web/html web/modules
by Tomáš Kašpárek
web/html/network/systems/ssm/system_list.pxt | 41 ---------------------------
web/modules/sniglets/Sniglets/ServerGroup.pm | 2 -
2 files changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 0b85317d115674a124c1d2c625f9523ba14af484
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jul 1 08:51:33 2013 +0200
979924 - fixing duplicate SSM, System List page
diff --git a/web/html/network/systems/ssm/system_list.pxt b/web/html/network/systems/ssm/system_list.pxt
deleted file mode 100644
index c275df7..0000000
--- a/web/html/network/systems/ssm/system_list.pxt
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><img src="/img/rhn-icon-system_group.gif" alt="system set" /> System Set Manager <rhn-help href="s1-sm-systems.jsp#s2-sm-ssm" /></h1>
-
- <rhn-navi-nav prefix="system_set_manager" depth="0"
- file="/nav/ssm.xml" style="contentnav" />
-
- <h2>Selected Systems List</h2>
-
- <div class="page-summary">
- <p>Below are your selected systems. All actions taken within this interface will apply only to the relevant systems in this set.</p>
-
- <p>To remove systems from the current set, select them from the list below and click the <strong>Remove</strong> button at the bottom of the page.</p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="in_set">
- <set name="systems in the set able to be removed from the set" label="removable_system_list" />
- <column name="Updates" label="advisory_icon" width="1%" align="center" />
- <column name="Errata" label="total_errata" width="1%" align="center">
- <url>/rhn/systems/details/ErrataList.do?sid={column:id}</url>
- </column>
- <column name="Packages" label="outdated_packages" width="1%" align="center">
- <url>/rhn/systems/details/packages/UpgradableList.do?sid={column:id}</url>
- </column>
- <column name="Name" label="name" align="left">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
- <column name="Base Channel" label="channel_labels" align="left" width="30%"/>
- <column name="Entitlement" label="entitlement_level" width="5%"/>
- <action name="Remove" label="remove" />
-</rhn-listview>
-
- </grail-canvas-template>
-
-</pxt-passthrough>
diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm
index 933a705..243b7c4 100644
--- a/web/modules/sniglets/Sniglets/ServerGroup.pm
+++ b/web/modules/sniglets/Sniglets/ServerGroup.pm
@@ -394,7 +394,7 @@ sub work_with_group_cb {
RHN::Set->copy_from_group($pxt->user->id, "system_list", $pxt->param('sgid'));
- $pxt->redirect("/network/systems/ssm/system_list.pxt");
+ $pxt->redirect("/rhn/systems/ssm/ListSystems.do");
}
1;
10 years, 3 months