schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/triggers/rhnKickstartSession.sql | 1
schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.postgresql | 32 ++++++++++
3 files changed, 34 insertions(+)
New commits:
commit a14b2f07e579a3d47aac1f76006f8f7f9f767ca9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 15:33:29 2011 +0100
Need to return new at the end of a trigger function.
Addressing
Caused by: org.postgresql.util.PSQLException: ERROR: control reached end of trigger procedure without RETURN
Where: PL/pgSQL function "rhn_ks_session_history_trigger_fun"
Pointed out by Pascal PELTRIAUX.
diff --git a/schema/spacewalk/postgres/triggers/rhnKickstartSession.sql b/schema/spacewalk/postgres/triggers/rhnKickstartSession.sql
index 61799df..b34fcc4 100644
--- a/schema/spacewalk/postgres/triggers/rhnKickstartSession.sql
+++ b/schema/spacewalk/postgres/triggers/rhnKickstartSession.sql
@@ -62,6 +62,7 @@ begin
);
end if;
end if;
+ return new;
end;
$$ language plpgsql;
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.postgresql
new file mode 100644
index 0000000..cce4dab
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.3-to-spacewalk-schema-1.4/007-rhn_ks_session_history_trigger_fun.sql.postgresql
@@ -0,0 +1,32 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+create or replace function rhn_ks_session_history_trigger_fun() returns trigger
+as
+$$
+begin
+ if tg_op ='INSERT' then
+ insert into rhnKickstartSessionHistory (
+ id, kickstart_session_id, action_id, state_id
+ ) values (
+ nextval('rhn_ks_sessionhist_id_seq'),
+ new.id,
+ new.action_id,
+ new.state_id
+ );
+ end if;
+ if tg_op ='UPDATE' then
+ if new.state_id is distinct from old.state_id then
+ insert into rhnKickstartSessionHistory (
+ id, kickstart_session_id, action_id, state_id
+ ) values (
+ nextval('rhn_ks_sessionhist_id_seq'),
+ new.id,
+ new.action_id,
+ new.state_id
+ );
+ end if;
+ end if;
+ return new;
+end;
+$$ language plpgsql;
+
13 years, 1 month
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 18 +++++-----
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit dce9669748d758730d1abc2c4fdd19c7439742f1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 15:12:16 2011 +0100
Fixing checkstyle issues.
Addressing
Class LocalVariableNameCheck
Detail Name 'locked_url' must match pattern '^[a-z][a-zA-Z0-9]*$'.
Class LocalVariableNameCheck
Detail Name 'locked_img' must match pattern '^[a-z][a-zA-Z0-9]*$'.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index 4f97e8e..6023842 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -159,22 +159,22 @@ public class SystemListHelper {
}
if (next.getLocked().intValue() == 1) {
- HtmlTag locked_url = new HtmlTag("a");
- HtmlTag locked_img = new HtmlTag("img");
+ HtmlTag lockedUrl = new HtmlTag("a");
+ HtmlTag lockedImg = new HtmlTag("img");
//status = "locked";
- locked_url.setAttribute("href",
+ lockedUrl.setAttribute("href",
"/rhn/help/reference/en-US/s1-sm-systems.jsp");
message = ls.getMessage("systemlist.jsp.locked");
- locked_img.setAttribute("src", "/img/icon_locked.gif");
- locked_img.setAttribute("alt", message);
- locked_img.setAttribute("title", message);
+ lockedImg.setAttribute("src", "/img/icon_locked.gif");
+ lockedImg.setAttribute("alt", message);
+ lockedImg.setAttribute("title", message);
if (makeLinks) {
- locked_url.addBody(locked_img);
- statusDisplay = statusDisplay + locked_url.render();
+ lockedUrl.addBody(lockedImg);
+ statusDisplay = statusDisplay + lockedUrl.render();
}
else {
- statusDisplay = statusDisplay + locked_img.render();
+ statusDisplay = statusDisplay + lockedImg.render();
}
}
13 years, 1 month
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit dbd4076cf16841d82c6f5fd3350fab2a886e6eed
Author: Jerome Fenal <jfenal(a)redhat.com>
Date: Fri Feb 25 14:37:13 2011 +0100
Fix SSM buttons translation.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
index 0b864e4..cea4004 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
@@ -1166,14 +1166,14 @@
</context-group>
<trans-unit id="manage">
<source>Manage</source>
- <target>Gère</target></trans-unit>
+ <target>Gérer</target></trans-unit>
<trans-unit id="clear">
<source>Clear</source>
- <target>Clair</target></trans-unit>
+ <target>Vider</target></trans-unit>
</group>
</body>
</file>
-</xliff>
\ No newline at end of file
+</xliff>
13 years, 1 month
java/code web/modules
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 30 +++++++---
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 10 +++
web/modules/sniglets/Sniglets/Servers.pm | 29 ++++++---
3 files changed, 50 insertions(+), 19 deletions(-)
New commits:
commit f789e57e1fe8d41e2c63bd8342de3573568168cb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 11:56:23 2011 +0100
680375 - we do not want the locked status (icon) to hide the the other statuses, we add separate padlock icon.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index 8f0bddf..4f97e8e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -80,15 +80,6 @@ public class SystemListHelper {
img.setAttribute("alt", message);
img.setAttribute("title", message);
}
- else if (next.getLocked().intValue() == 1) {
- //status = "locked";
- url.setAttribute("href",
- "/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.locked");
- img.setAttribute("src", "/img/icon_locked.gif");
- img.setAttribute("alt", message);
- img.setAttribute("title", message);
- }
else if (SystemManager.isKickstarting(user,
new Long(next.getId().longValue()))) {
//status = "kickstarting";
@@ -166,6 +157,27 @@ public class SystemListHelper {
else {
statusDisplay = img.render();
}
+
+ if (next.getLocked().intValue() == 1) {
+ HtmlTag locked_url = new HtmlTag("a");
+ HtmlTag locked_img = new HtmlTag("img");
+
+ //status = "locked";
+ locked_url.setAttribute("href",
+ "/rhn/help/reference/en-US/s1-sm-systems.jsp");
+ message = ls.getMessage("systemlist.jsp.locked");
+ locked_img.setAttribute("src", "/img/icon_locked.gif");
+ locked_img.setAttribute("alt", message);
+ locked_img.setAttribute("title", message);
+ if (makeLinks) {
+ locked_url.addBody(locked_img);
+ statusDisplay = statusDisplay + locked_url.render();
+ }
+ else {
+ statusDisplay = statusDisplay + locked_img.render();
+ }
+ }
+
next.setStatusDisplay(statusDisplay);
}
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index d827fc1..6c216c1 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -678,6 +678,16 @@ sub row_callback {
-border => 0);
$row->{ADVISORY_ICON} = PXT::HTML->link($icon_data->{link}, $image);
+
+ my $locked_data = Sniglets::Servers::system_locked_info($pxt->user, $row);
+ if ($locked_data->{link}) {
+ my $locked_image = PXT::HTML->img(-src => $locked_data->{image},
+ -alt => $locked_data->{status_str},
+ -title => $locked_data->{status_str},
+ -border => 0);
+
+ $row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link}, $locked_image);
+ }
}
$row->{MONITORING_ICON} = '';
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index baaf388..84153a0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -399,6 +399,25 @@ sub server_name {
return PXT::Utils->escapeHTML($server->name);
}
+sub system_locked_info {
+ my $user = shift;
+ my $data = shift;
+
+ my $ret = {};
+ if ($data->{LOCKED}) {
+ $ret->{image} = '/img/icon_locked.gif';
+ $ret->{image_medium} = '/img/icon_locked.gif';
+ $ret->{status_str} = 'System locked';
+ $ret->{status_class} = 'system-status-locked';
+ $ret->{message} = 'more info';
+ $ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
+ -href => 's1-sm-systems.html#S3-SM-SYSTEM-DETAILS');
+
+ }
+ return $ret;
+}
+
+
# not a sniglet
sub system_status_info {
my $user = shift;
@@ -433,16 +452,6 @@ sub system_status_info {
$ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
-href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT');
}
- elsif ($data->{LOCKED}) {
- $ret->{image} = '/img/icon_locked.gif';
- $ret->{image_medium} = '/img/icon_locked.gif';
- $ret->{status_str} = 'System locked';
- $ret->{status_class} = 'system-status-locked';
- $ret->{message} = 'more info';
- $ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
- -href => 's1-sm-systems.html#S3-SM-SYSTEM-DETAILS');
-
- }
elsif ($data->{KICKSTART_SESSION_ID}) {
$ret->{image} = '/img/icon_kickstart_session.gif';
$ret->{image_medium} = '/img/icon_kickstart_session.gif';
13 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 68d2eab7c251b47d01d313ff82a1b4c549b74f99
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 25 11:06:49 2011 +0100
checkstyle fix
Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 07b02f0..4f9346f 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2031,7 +2031,8 @@ public class SystemManager extends BaseManager {
/* If serverIn is fve eligible, check number of flex guest entitlements available */
if (m.execute(params).size() >= 1) {
- availableSubscriptions = ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
+ availableSubscriptions =
+ ChannelManager.getAvailableFveEntitlements(orgIn, channelIn);
}
/* If the previous query did not result any data or the number of flex guest
13 years, 1 month
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 90c4713e476244a3cf83bff1244345b4bcb17b41
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 10:57:23 2011 +0100
Fixing systems_in_channel_family query for PostgreSQL.
Addressing
DBD::Pg::st execute failed: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list\nLINE 11: ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index e261064..f482eee 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -873,6 +873,7 @@ ORDER BY SP.position
<mode name="systems_in_channel_family">
<query params="org_id, cfam_id, user_id">
+select * from (
SELECT distinct S.id, S.name
FROM rhnServer S,
rhnServerChannel SC,
@@ -882,7 +883,8 @@ SELECT distinct S.id, S.name
AND SC.channel_id = CFM.channel_id
AND CFM.channel_family_id = :cfam_id
AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND USP.server_id = S.id)
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+) X
+ORDER BY UPPER(NVL(X.NAME, '(none)')), X.ID
</query>
<elaborator name="system_overview" />
<elaborator name="entitlements"/>
13 years, 1 month
java/docs web/html
by Jan Pazdziora
java/docs/webtesting/simple-stress-plan.jmx | 2
web/html/network/systems/details/hardware.pxt | 298 --------------------------
2 files changed, 1 insertion(+), 299 deletions(-)
New commits:
commit 4d1300151357f43421005569b22a711db18eb3d3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 10:11:41 2011 +0100
The /network/systems/details/hardware.pxt was replaced by /rhn/systems/details/SystemHardware.do.
diff --git a/java/docs/webtesting/simple-stress-plan.jmx b/java/docs/webtesting/simple-stress-plan.jmx
index 1b66a64..ec8e824 100644
--- a/java/docs/webtesting/simple-stress-plan.jmx
+++ b/java/docs/webtesting/simple-stress-plan.jmx
@@ -833,7 +833,7 @@
</node>
<node>
<testelement class="org.apache.jmeter.protocol.http.sampler.HTTPSampler">
-<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.path">/network/systems/details/hardware.pxt</property>
+<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.path">/rhn/systems/details/SystemHardware.do</property>
<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="TestElement.test_class">org.apache.jmeter.protocol.http.sampler.HTTPSampler</property>
<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.StringProperty" name="HTTPSampler.method">GET</property>
<property xml:space="preserve" propType="org.apache.jmeter.testelement.property.BooleanProperty" name="HTTPSampler.use_keepalive">true</property>
diff --git a/web/html/network/systems/details/hardware.pxt b/web/html/network/systems/details/hardware.pxt
deleted file mode 100644
index bf15eea..0000000
--- a/web/html/network/systems/details/hardware.pxt
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Servers" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-<pxt-formvar>
- <pxt-include-late file="/network/components/systems/system_details_toolbar.pxi" />
-</pxt-formvar>
-
- <rhn-navi-nav prefix="system_details" depth="0" file="/nav/system_detail.xml" style="contentnav" />
-
- <h2>Refresh Hardware List</h2>
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-<rhn-require acl="system_feature(ftr_hardware_refresh)">
-
- <div class="page-summary">The following list represents the detectable hardware on this system. If this list is incomplete, you may press the button below to schedule a hardware list refresh for this system.</div>
-<br />
- <div align="right">
- <pxt-form method="post">
- <input type="submit" name="hardware_list_refresh" value="Schedule Hardware Refresh" />
- <input type="hidden" name="pxt:trap" value="rhn:server_hardware_list_refresh_cb" />
- <pxt-hidden name="sid" />
- </pxt-form>
- </div>
-</rhn-require>
-
-<rhn-require acl="not system_feature(ftr_hardware_refresh)">
-
- <div class="page-summary">
-<pxt-formvar>
- The following list represents the detectable hardware on this system. If this list is incomplete, you must <a href="/rhn/systems/details/Overview.do?sid={formvar:sid}">entitle</a> this system before you can schedule a hardware list refresh.
-</pxt-formvar>
- </div>
-</rhn-require>
-
-<rhn-server-hardware-profile>
- <h2>General</h2>
-
- <div class="page-summary">({cpu_count}) {cpu_vendor} {cpu_model} {cpu_mhz} MHZ</div>
- <br />
- <table class="details">
- <tr>
- <th>Arch:</th>
- <td>{cpu_arch_name}</td>
- <th>Cache:</th>
- <td>{cpu_cache}</td>
- </tr>
-
- <tr>
- <th>Vendor:</th>
- <td>{cpu_vendor}</td>
- <th rowspan="2">Memory:</th>
- <td rowspan="2">{memory_ram} MB</td>
- </tr>
-
- <tr>
- <th>Stepping:</th>
- <td>{cpu_stepping}</td>
- </tr>
-
- <tr>
- <th>Family:</th>
- <td>{cpu_family}</td>
- <th>Swap:</th>
- <td>{memory_swap} MB</td>
- </tr>
- </table>
-
-
-<rhn-dmi-info>
- <h2>DMI Info</h2>
-
- <table class="details">
- <tr>
- <th>Vendor:</th>
- <td>{dmi_vendor}</td>
- <th rowspan="2">Bios:</th>
- <td rowspan="2">{dmi_bios_vendor} <br/>
- {dmi_bios_version} - {dmi_bios_release}</td>
- </tr>
-
- <tr>
- <th>System:</th>
- <td>{dmi_system}</td>
- </tr>
-
- <tr>
- <th rowspan="2">Product:</th>
- <td rowspan="2">{dmi_product}</td>
- <th valign="top">Asset Tag:</th>
- <td>{dmi_asset}</td>
- </tr>
-
- <tr>
- <th valign="top">Board:</th>
- <td>{dmi_board}</td>
- </tr>
- </table>
-</rhn-dmi-info>
-
-
- <h2>Networking</h2>
-
-
- <table class="details">
-<rhn-server-network-details>
- <tr>
- <th>Hostname{counter}:</th>
- <td>{hostname}</td>
- </tr>
-
- <tr>
- <th>IP Address{counter}:</th>
- <td>{ip}</td>
- </tr>
-</rhn-server-network-details>
- </table>
-
-<br />
-
-<rhn-server-network-interfaces>
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th>Interface</th>
- <th>IP Address</th>
- <th>Netmask</th>
- <th>Broadcast</th>
- <th>Hardware Address</th>
- <th>Driver Module</th>
- </tr>
- </thead>
- <rhn-interface-data>
- <tr class="{row_class}">
- <td class="first-column">{interface_name}</td>
- <td>{interface_ip_addr}</td>
- <td>{interface_netmask}</td>
- <td>{interface_broadcast}</td>
- <td>{interface_hw_addr}</td>
- <td class="last-column">{interface_module}</td>
- </tr>
- </rhn-interface-data>
- </table>
-</rhn-server-network-interfaces>
-
-<rhn-server-device class="HD">
- <h2>Storage</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="25%">Device</th>
- <th width="25%">Physical</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column">{hd_description}</td>
- <td>{hd_bus}</td>
- <td>{hd_device}</td>
- <td class="last-column">{hd_physical}</td>
- </tr>
-</rhn-device-data>
- </table>
-</rhn-server-device>
-
-<rhn-server-device class="VIDEO">
- <h2>Video</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="10%">Vendor</th>
- <th width="40%">Driver</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column" nowrap="1">{video_description}</td>
- <td>{video_bus}</td>
- <td>{video_vendorstring}</td>
- <td class="last-column" nowrap="1">{video_driver}</td>
- </tr>
-</rhn-device-data>
- </table>
-</rhn-server-device>
-
-<rhn-server-device class="AUDIO">
- <h2>Audio</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="25%">Vendor</th>
- <th width="25%">Driver</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column">{audio_description}</td>
- <td>{audio_bus}</td>
- <td>{audio_vendorstring}</td>
- <td class="last-column">{audio_driver}</td>
- </tr>
-</rhn-device-data>
- </table>
-</rhn-server-device>
-
-<rhn-server-device class="USB">
- <h2>USB</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="25%">Vendor</th>
- <th width="25%">Driver</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column">{usb_description}</td>
- <td>{usb_bus}</td>
- <td>{usb_vendorstring}</td>
- <td class="last-column">{usb_driver}</td>
- </tr>
-</rhn-device-data>
- </table>
-</rhn-server-device>
-
-<rhn-server-device class="CAPTURE">
- <h2>CAPTURE</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="25%">Vendor</th>
- <th width="25%">Driver</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column">{capture_description}</td>
- <td>{capture_bus}</td>
- <td>{capture_vendorstring}</td>
- <td class="last-column">{capture_driver}</td>
- </tr>
-</rhn-device-data>
- </table>
-</rhn-server-device>
-
-<rhn-server-device class="OTHER">
- <h2>Misc</h2>
-
- <table class="list" width="90%" cellspacing="0">
- <thead>
- <tr>
- <th width="40%">Description</th>
- <th width="10%">Bus</th>
- <th width="25%">Vendor</th>
- <th width="25%">Driver</th>
- </tr>
- </thead>
-
-<rhn-device-data>
- <tr class="{row_class}">
- <td class="first-column">{other_description}</td>
- <td>{other_bus}</td>
- <td>{other_vendorstring}</td>
- <td class="last-column">{other_driver}</td>
- </tr>
-</rhn-device-data>
- </table>
-
-</rhn-server-device>
-</rhn-server-hardware-profile>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
13 years, 1 month
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d31a8d9bdd366524996795b5b018b7352f1256c9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 09:49:51 2011 +0100
We want to show the bios information if it is *not* empty.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
index c3b1070..d377a49 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemHardwareAction.java
@@ -110,13 +110,13 @@ public class SystemHardwareAction extends RhnAction {
if (server.getDmi() != null) {
if (server.getDmi().getBios() != null) {
- if (StringUtils.isEmpty(server.getDmi().getBios().getVendor())) {
+ if (StringUtils.isNotEmpty(server.getDmi().getBios().getVendor())) {
dmiBios.append(server.getDmi().getBios().getVendor() + " ");
}
- if (StringUtils.isEmpty(server.getDmi().getBios().getVersion())) {
+ if (StringUtils.isNotEmpty(server.getDmi().getBios().getVersion())) {
dmiBios.append(server.getDmi().getBios().getVersion() + " ");
}
- if (StringUtils.isEmpty(server.getDmi().getBios().getRelease())) {
+ if (StringUtils.isNotEmpty(server.getDmi().getBios().getRelease())) {
dmiBios.append(server.getDmi().getBios().getRelease());
}
}
13 years, 1 month
2 commits - client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/data/rh_register.glade | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 22020dd9124629849fc07bf87bb3df46ddbcfc06
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 19:14:47 2011 +0100
provide path to puplet-screenshot.png
addressing:
(rhn_register:1801): libglade-WARNING **: Error loading image: Failed to open file '/usr/share/rhn/up2date_client/puplet-screenshot.png': No such file or directory
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index 2360d33..450b86d 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -5353,7 +5353,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="pixbuf">puplet-screenshot.png</property>
+ <property name="pixbuf">/usr/share/pixmaps/puplet-screenshot.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
commit 521caebd596d4fcd7d5dbba52662392bf5bffead
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 19:10:23 2011 +0100
move <accessibility> in front of <signal>
addressing:
(rhn_register:1782): libglade-WARNING **: Unexpected element <accessibility> inside <widget>.
accessibility tag could not be after signal. I'm not sure if it
documented, but it is in glade code. Live with that.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index b6d207f..2360d33 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -127,10 +127,10 @@ You may access the software update tool by running <b>Software Update</
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_whyRegisterButton_clicked"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Why Should I Connect to RHN? ...</atkproperty>
</accessibility>
+ <signal name="clicked" handler="on_whyRegisterButton_clicked"/>
</widget>
</child>
</widget>
@@ -410,11 +410,11 @@ You may access the software update tool by running <b>Software Update</
<property name="has_frame">True</property>
<property name="invisible_char">•</property>
<property name="activates_default">False</property>
- <signal name="changed" handler="onSatelliteServerEntryChanged"/>
- <signal name="focus_in_event" handler="onSatelliteServerEntryFocused"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">satellite server location</atkproperty>
</accessibility>
+ <signal name="changed" handler="onSatelliteServerEntryChanged"/>
+ <signal name="focus_in_event" handler="onSatelliteServerEntryFocused"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -513,10 +513,10 @@ You may access the software update tool by running <b>Software Update</
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="onAdvancedNetworkConfigurationButtonClicked"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Advanced Network Configuration button</atkproperty>
</accessibility>
+ <signal name="clicked" handler="onAdvancedNetworkConfigurationButtonClicked"/>
</widget>
<packing>
<property name="padding">0</property>
@@ -683,10 +683,10 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
- <signal name="activate" handler="onLoginUserEntryActivate"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">RHN login field</atkproperty>
</accessibility>
+ <signal name="activate" handler="onLoginUserEntryActivate"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -708,10 +708,10 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="has_frame">True</property>
<property name="invisible_char">•</property>
<property name="activates_default">False</property>
- <signal name="activate" handler="onLoginPasswordEntryActivate"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">RHN password field</atkproperty>
</accessibility>
+ <signal name="activate" handler="onLoginPasswordEntryActivate"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -2052,10 +2052,10 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="has_frame">True</property>
<property name="invisible_char">•</property>
<property name="activates_default">False</property>
- <signal name="changed" handler="registrationNumberEntryChanged"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">installation number field</atkproperty>
</accessibility>
+ <signal name="changed" handler="registrationNumberEntryChanged"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -2558,10 +2558,10 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="onViewHardwareButtonClicked"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">View Hardware Profile</atkproperty>
</accessibility>
+ <signal name="clicked" handler="onViewHardwareButtonClicked"/>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -2740,10 +2740,10 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="onBackToRegistrationButtonClicked"/>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Take me back to the registration</atkproperty>
</accessibility>
+ <signal name="clicked" handler="onBackToRegistrationButtonClicked"/>
</widget>
<packing>
<property name="padding">0</property>
13 years, 1 month
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/data/rh_register.glade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 140fc0c7997079ac74a890e69fbc1d063084e52a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Feb 24 18:48:03 2011 +0100
580479 - do not let combo box to fill available space
it looks ugly in firstboot when you have screen with a lot of height
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index ab1a2d5..b6d207f 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -5531,7 +5531,7 @@ You'll know when software updates are available when a package icon appears in t
<packing>
<property name="padding">0</property>
<property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
13 years, 1 month