java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java | 162 +-------
java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigFileTagTest.java | 195 ----------
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 3
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6
5 files changed, 38 insertions(+), 330 deletions(-)
New commits:
commit c7cd1f2a3dad4fc2fe62e7caabddb0ae93a4d455
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 17 10:11:19 2013 +0100
rework logic of ConfigFileTag so it uses icons instead of gifs and cool stuff
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
index 2dc8c7c..2207c16 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigFileTag.java
@@ -14,13 +14,14 @@
*/
package com.redhat.rhn.frontend.configuration.tags;
-import com.redhat.rhn.domain.config.ConfigFileType;
+import java.io.IOException;
+
+import com.redhat.rhn.frontend.taglibs.IconTag;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.TagSupport;
@@ -36,26 +37,9 @@ public class ConfigFileTag extends TagSupport {
*/
private static final long serialVersionUID = 1582063245840138731L;
- private static final Logger LOG = Logger.getLogger(ConfigFileTag.class);
-
- public static final String DIR_ALT_KEY = "config.common.dirAlt";
- public static final String FILE_ALT_KEY = "config.common.fileAlt";
- public static final String SYMLINK_ALT_KEY = "config.common.symlinkAlt";
-
-
- public static final String DIR_LIST_ICON = "/img/rhn-listicon-cfg_folder.gif";
- public static final String FILE_LIST_ICON = "/img/rhn-listicon-cfg_file.gif";
- public static final String SYMLINK_LIST_ICON = "/img/rhn-listicon-cfg_symlink.gif";
-
-
- public static final String DIR_HEADER_ICON = "/img/folder-config.png";
- public static final String FILE_HEADER_ICON = "/img/file-config.png";
- public static final String SYMLINK_HEADER_ICON = "/img/link-config.png";
-
-
public static final String FILE_URL = "/rhn/configuration/file/FileDetails.do";
public static final String FILE_COMPARE_URL =
- "/rhn/configuration/file/CompareRevision.do";
+ "/rhn/configuration/file/CompareRevision.do";
/**
* <cfg:file id="" value="" type="file|dir" revision="" nolink="">
@@ -71,9 +55,10 @@ public class ConfigFileTag extends TagSupport {
*/
@Override
public int doEndTag() throws JspException {
+ StringBuilder result = new StringBuilder();
if (nolink || id == null) {
- writeIcon();
- ConfigTagHelper.write(StringEscapeUtils.escapeXml(path), pageContext);
+ result.append(writeIcon());
+ result.append(StringEscapeUtils.escapeXml(path));
}
else {
String url;
@@ -84,9 +69,16 @@ public class ConfigFileTag extends TagSupport {
url = makeConfigFileUrl(id);
}
- ConfigTagHelper.write("<a href=\"" + url + "\">", pageContext);
- writeIcon();
- ConfigTagHelper.write(StringEscapeUtils.escapeXml(path) + "</a>", pageContext);
+ result.append("<a href=\"" + url + "\">");
+ result.append(writeIcon());
+ result.append(StringEscapeUtils.escapeXml(path) + "</a>");
+ }
+ JspWriter writer = pageContext.getOut();
+ try {
+ writer.write(result.toString());
+ }
+ catch (IOException e) {
+ throw new JspException(e);
}
return BodyTagSupport.SKIP_BODY;
}
@@ -104,7 +96,6 @@ public class ConfigFileTag extends TagSupport {
super.release();
}
-
/**
* @param val the id to set
*/
@@ -113,7 +104,6 @@ public class ConfigFileTag extends TagSupport {
this.id = val;
}
-
/**
* @param isNoLink the nolink to set
*/
@@ -121,7 +111,6 @@ public class ConfigFileTag extends TagSupport {
this.nolink = Boolean.TRUE.toString().equalsIgnoreCase(isNoLink);
}
-
/**
* @param tp the type to set
*/
@@ -129,7 +118,6 @@ public class ConfigFileTag extends TagSupport {
this.type = tp;
}
-
/**
* @param value the value to set
*/
@@ -144,44 +132,23 @@ public class ConfigFileTag extends TagSupport {
this.revisionId = rev;
}
- private void writeIcon() throws JspException {
- if (checkType()) {
- if ("dir".equalsIgnoreCase(type) ||
- "directory".equalsIgnoreCase(type) ||
- "folder".equalsIgnoreCase(type)) {
- ConfigTagHelper.writeIcon(DIR_LIST_ICON, DIR_ALT_KEY, pageContext);
- }
- else if ("symlink".equalsIgnoreCase(type)) {
- ConfigTagHelper.writeIcon(SYMLINK_LIST_ICON, SYMLINK_ALT_KEY, pageContext);
- }
- else {
- ConfigTagHelper.writeIcon(FILE_LIST_ICON,
- FILE_ALT_KEY, pageContext);
- }
- }
- else {
- ConfigTagHelper.writeErrorIcon(pageContext);
- }
- }
-
- /**
- * Checks to see if no invalid values are specified
- */
- private boolean checkType() {
- if ((StringUtils.isBlank(id) && StringUtils.isBlank(path)) ||
- (StringUtils.isBlank(type))) {
- return false;
+ private String writeIcon() throws JspException {
+ IconTag i = new IconTag();
+ i.setParent(getParent());
+ i.setPageContext(pageContext);
+ if ("dir".equalsIgnoreCase(type) || "directory".equalsIgnoreCase(type) ||
+ "folder".equalsIgnoreCase(type)) {
+ i.setType("file-directory");
}
- try {
- ConfigFileType.lookup(type);
- return true;
+ else if ("symlink".equalsIgnoreCase(type)) {
+ i.setType("file-symlink");
}
- catch (IllegalArgumentException ie) {
- String message = String.format("Error encoountered when " +
- "handling -> %s - %s", id, path);
- LOG.warn(message + "\n" + ie.toString(), ie);
- return false;
+ else {
+ i.setType("file-file");
}
+ String result = i.renderStartTag();
+ i.release();
+ return result;
}
/**
@@ -228,69 +195,4 @@ public class ConfigFileTag extends TagSupport {
return FILE_COMPARE_URL + "?cfid=" + fileId;
}
- /**
- * Returns the Header icon image path for given config file type (file|dir)
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- *
- * @param type (file|dir)
- * @return the image path
- */
- public static final String getHeaderIconFor(String type) {
-
- if ("dir".equalsIgnoreCase(type) ||
- "directory".equalsIgnoreCase(type) ||
- "folder".equalsIgnoreCase(type)) {
- return DIR_HEADER_ICON;
- }
- else if ("symlink".equalsIgnoreCase(type) ||
- "link".equalsIgnoreCase(type)) {
- return SYMLINK_HEADER_ICON;
- }
- return FILE_HEADER_ICON;
- }
-
- /**
- * Returns the Header icon image path for given config file type (file|dir|symlink)
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- *
- * @param type (file|dir)
- * @return the image path
- */
- public static final String getListIconFor(String type) {
-
- if ("dir".equalsIgnoreCase(type) ||
- "directory".equalsIgnoreCase(type) ||
- "folder".equalsIgnoreCase(type)) {
- return DIR_LIST_ICON;
- }
- else if ("symlink".equalsIgnoreCase(type)) {
- return SYMLINK_LIST_ICON;
- }
- return FILE_LIST_ICON;
- }
-
-
- /**
- * Returns the Header alt key for a given config file type (file|dir|symlink)
- * This method is public static because
- * EL functions defined in a TLD file,
- * need to be public static methods..
- * @param type (file|dir)
- * @return the alt key
- */
- public static final String getAltKeyFor(String type) {
- if ("dir".equalsIgnoreCase(type) ||
- "directory".equalsIgnoreCase(type) ||
- "folder".equalsIgnoreCase(type)) {
- return DIR_ALT_KEY;
- }
- else if ("symlink".equalsIgnoreCase(type)) {
- return SYMLINK_ALT_KEY;
- }
- return FILE_ALT_KEY;
- }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigFileTagTest.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigFileTagTest.java
deleted file mode 100644
index 32cfe9c..0000000
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/test/ConfigFileTagTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * Copyright (c) 2009--2010 Red Hat, Inc.
- *
- * This software is licensed to you under the GNU General Public License,
- * version 2 (GPLv2). There is NO WARRANTY for this software, express or
- * implied, including the implied warranties of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
- * along with this software; if not, see
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * Red Hat trademarks are not licensed under GPLv2. No permission is
- * granted to use or replicate Red Hat trademarks that are incorporated
- * in this software or its documentation.
- */
-package com.redhat.rhn.frontend.configuration.tags.test;
-
-import com.redhat.rhn.common.localization.LocalizationService;
-import com.redhat.rhn.domain.config.ConfigFileType;
-import com.redhat.rhn.frontend.configuration.tags.ConfigFileTag;
-import com.redhat.rhn.frontend.configuration.tags.ConfigTagHelper;
-import com.redhat.rhn.testing.RhnBaseTestCase;
-import com.redhat.rhn.testing.RhnMockHttpServletRequest;
-import com.redhat.rhn.testing.RhnMockJspWriter;
-import com.redhat.rhn.testing.TagTestUtils;
-
-import com.mockobjects.helpers.TagTestHelper;
-
-import java.net.URL;
-
-import javax.servlet.jsp.tagext.Tag;
-
-
-/**
- * ConfigFileTagTest
- * @version $Rev$
- */
-public class ConfigFileTagTest extends RhnBaseTestCase {
- /**
- * Called once per test method.
- * @throws Exception if an error occurs during setup.
- */
- protected void setUp() throws Exception {
- super.setUp();
- ConfigFileTag tag = new ConfigFileTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- }
-
- /** Test tag output for files
- */
- public void testFile() throws Exception {
-
- String alt = ConfigFileTag.FILE_ALT_KEY;
- String imgName = ConfigFileTag.FILE_LIST_ICON;
-
- execTest(0, "bar",
- ConfigFileType.file().getLabel(),
- false, alt, imgName);
- }
-
- /** Test tag output for files
- */
- public void testDirs() throws Exception {
-
- String alt = ConfigFileTag.DIR_ALT_KEY;
- String imgName = ConfigFileTag.DIR_LIST_ICON;
-
- execTest(0, "bar",
- ConfigFileType.dir().getLabel(),
- false, alt, imgName);
- execTest(0, "bar", "dir", false, alt, imgName);
- execTest(0, "bar", "directory", false, alt, imgName);
- execTest(0, "bar", "folder", false, alt, imgName);
- execTest(-2, "bar", "folder", false, alt, imgName);
- execTest(0, "bar",
- ConfigFileType.dir().getLabel(),
- true, alt, imgName, 2);
- }
- public void testFailure() throws Exception {
-
- ConfigFileTag tag = new ConfigFileTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- tag.setId(String.valueOf(1));
- tag.setPath("FOO");
-
- String type = "FAILURE";
- tag.setType(type);
-
- // ok let's test the tag
- tth.assertDoStartTag(Tag.SKIP_BODY);
- tth.assertDoEndTag(Tag.SKIP_BODY);
- RhnMockJspWriter rout = (RhnMockJspWriter) tth.getPageContext().getOut();
- assertTrue(rout.toString().
- indexOf(ConfigTagHelper.CONFIG_ERROR_ALT_TEXT) > -1);
- assertTrue(rout.toString().
- indexOf(ConfigTagHelper.CONFIG_ERROR_IMG) > -1);
- }
-
-
- public void execTest(int id, String name,
- String type, boolean nolink,
- String altKey, String imgName) throws Exception {
- execTest(id, name, type, nolink, altKey, imgName, -1);
- }
- public void execTest(int id, String name,
- String type, boolean nolink,
- String altKey, String imgName,
- int revisionId) throws Exception {
- ConfigFileTag tag = new ConfigFileTag();
- RhnMockHttpServletRequest request = new RhnMockHttpServletRequest();
- TagTestHelper tth = TagTestUtils.setupTagTest(tag,
- new URL("http://localhost"),
- request);
- tag.setPageContext(tth.getPageContext());
- if (id >= 0) {
- tag.setId(String.valueOf(id));
- }
-
- tag.setPath(name);
- tag.setType(type);
- tag.setNolink(String.valueOf(nolink));
- if (revisionId >= 0) {
- tag.setRevisionId(String.valueOf(revisionId));
- }
-
- // ok let's test the tag
- tth.assertDoStartTag(Tag.SKIP_BODY);
- tth.assertDoEndTag(Tag.SKIP_BODY);
-
- RhnMockJspWriter rout = (RhnMockJspWriter) tth.getPageContext().getOut();
-
- assertTrue(rout.toString().indexOf(name) > -1);
- assertFalse(rout.toString().indexOf("alt =\"\"") > -1);
- LocalizationService service = LocalizationService.getInstance();
- String alt = service.getMessage(altKey);
- assertTrue(rout.toString().indexOf(alt) > -1);
- assertTrue(rout.toString().indexOf(imgName) > -1);
- if (!nolink && id >= 0) {
- String url = "<a href=\"" + ConfigFileTag.FILE_URL + "?cfid=" + id;
- assertTrue(rout.toString().startsWith(url));
- if (revisionId >= 0) {
- url = "<a href=\"" + ConfigFileTag.FILE_URL +
- "?ccid=" + id + "&crid=" + revisionId;
- assertTrue(rout.toString().startsWith(url));
- }
- }
- else {
- assertFalse(rout.toString().startsWith("<a href"));
- }
-
- }
-
- public void testFunctions() {
- checkFunctions(ConfigFileTag.DIR_HEADER_ICON,
- ConfigFileTag.DIR_ALT_KEY,
- "dir");
- //also checking case sensititvity
- checkFunctions(ConfigFileTag.DIR_HEADER_ICON,
- ConfigFileTag.DIR_ALT_KEY,
- "dirECtory");
- checkFunctions(ConfigFileTag.DIR_HEADER_ICON,
- ConfigFileTag.DIR_ALT_KEY,
- "folder");
-
- checkFunctions(ConfigFileTag.FILE_HEADER_ICON,
- ConfigFileTag.FILE_ALT_KEY,
- "file");
-
- String url = ConfigFileTag.makeConfigFileRevisionUrl("" + 1, "" + 2);
- assertTrue(url.indexOf("crid=2") > -1);
- assertTrue(url.indexOf("cfid=1") > -1);
- assertTrue(url.startsWith(ConfigFileTag.FILE_URL));
-
- url = ConfigFileTag.makeConfigFileUrl("" + 1);
- assertTrue(url.indexOf("cfid=1") > -1);
- assertTrue(url.startsWith(ConfigFileTag.FILE_URL));
-
-
- url = ConfigFileTag.makeFileCompareUrl("" + 1);
- assertTrue(url.indexOf("cfid=1") > -1);
- assertTrue(url.startsWith(ConfigFileTag.FILE_COMPARE_URL));
- }
-
- private void checkFunctions(String icon, String altKey, String type) {
- assertEquals(altKey, ConfigFileTag.getAltKeyFor(type));
- assertEquals(icon, ConfigFileTag.getHeaderIconFor(type));
- }
-}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index c88ef07..e559ec6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -14457,7 +14457,7 @@ any of these revisions. Are you sure you want to do this?</source>
<source>Overridden By</source>
</trans-unit>
<trans-unit id="sdc.config.file_list.revision_from">
- <source><a href="{0}"><img src ="{1}" alt="{2}"/>Revision {3}</a> from {4}</source>
+ <source><a href="{0}">Revision {1}</a> from {2}</source>
</trans-unit>
<trans-unit id="sdc.config.file_list.revision">
<source><a href="{0}">Revision {1}</a></source>
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
index fd39531..4e4b3cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -49,6 +49,9 @@ public class IconTag extends TagSupport {
icons.put("event-type-package", "fa spacewalk-icon-packages");
icons.put("event-type-preferences", "fa fa-cog");
icons.put("event-type-system", "fa fa-desktop");
+ icons.put("file-directory", "fa fa-folder-open-o");
+ icons.put("file-file", "fa fa-file-text-o");
+ icons.put("file-symlink", "fa spacewalk-icon-listicon-cfg-symlink");
icons.put("header-action", "fa fa-clock-o");
icons.put("header-activation-key", "fa fa-key");
icons.put("header-channel", "fa spacewalk-icon-software-channels");
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
index 4c289fd..4b7127d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
@@ -57,10 +57,8 @@
</c:set>
<bean:message key="sdc.config.file_list.revision_from"
arg0 = "${cfg:fileRevisionUrl(current.configFileId, current.configRevisionId)}"
- arg1 = "${cfg:fileListIcon(current.configFileType)}"
- arg2 = "${rhn:localize(cfg:fileAlt(current.configFileType))}"
- arg3 = "${current.configRevision}"
- arg4 = "${channelDisplay}"
+ arg1 = "${current.configRevision}"
+ arg2 = "${channelDisplay}"
/>
</c:when>
<c:otherwise>
10 years, 4 months
java/code
by mkollar
java/code/webapp/WEB-INF/pages/groups/erratalist.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 88676b0def7cee6ab92f4626280b9169a76c405c
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Tue Dec 17 10:33:29 2013 +0100
Fixed link
diff --git a/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp
index 7f3fd52..09baeba 100644
--- a/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/erratalist.jsp
@@ -52,7 +52,7 @@
</rl:column>
<rl:column headerkey="erratalist.jsp.systems"
styleclass="text-align: center;">
- <a href="/rhn/errata/details/SystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
+ <a href="/network/systems/groups/systems_affected_by_errata.pxt?sgid=${systemgroup.id}&eid=${current.id}">${current.affectedSystemCount}</a>
</rl:column>
<c:if test="${displayCves}">
<rl:column headerkey="erratalist.jsp.updated"
10 years, 4 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1c75ab6740c9de287e8364fcf1144b27d4b693a0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Dec 17 10:05:31 2013 +0100
render icon even while not displaying link
diff --git a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
index 4f202f3..09729a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/configuration/tags/ConfigChannelTag.java
@@ -52,7 +52,7 @@ public class ConfigChannelTag extends TagSupport {
public int doEndTag() throws JspException {
StringBuilder result = new StringBuilder();
if (nolink || id == null) {
- writeIcon();
+ result.append(writeIcon());
result.append(name);
}
else {
10 years, 4 months
backend/common backend/server
by StephenHerr
backend/common/rhnException.py | 2 +-
backend/server/handlers/xmlrpc/registration.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d4bd19cd7fd6779a67c9bcdb2518f203ece67de7
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Dec 16 15:43:01 2013 -0500
1043657 - allow 1 character system profile names
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index a8aaf3d..75e3ac7 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -172,7 +172,7 @@ maximum membership exceeded"),
700: _("Maximum username length violation"),
701: _("Maximum password length violation"),
- 800: _("System Name cannot be less than 3 characters"),
+ 800: _("System Name cannot be less than 1 character"),
# 1000-1999: Proxy specific errors:
# issued by a Proxy to the client
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index 62dcd55..438e489 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -224,7 +224,7 @@ class Registration(rhnHandler):
if profile_name is not None and not \
rhnFlags.test("re_registration_token") and \
- len(profile_name) < 3:
+ len(profile_name) < 1:
raise rhnFault(800)
# log entry point
10 years, 4 months
Changes to 'refs/tags/tito-0.4.18-1.4'
by Michael Mraka
Tag 'tito-0.4.18-1.4' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-16 15:54 +0000
Tagging package [tito] version [0.4.18-1.4] in directory [spec-tree/tito/].
Changes since spacewalk-config-2.1.3-1:
Michael Mraka (4):
fixing references to SSM errata page
removed unused ssm errata pxt pages
fixed building third party packages
Automatic commit of package [tito] minor release [0.4.18-1.4].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
rel-eng/packages/tito | 2
spec-tree/tito/0001-fixed-building-third-party-packages.patch | 52 ++++++++++
spec-tree/tito/tito.spec | 4
web/html/network/systems/ssm/errata/index.pxt | 44 --------
web/html/network/systems/ssm/errata/systems_affected.pxt | 42 --------
web/include/nav/ssm.xml | 8 -
web/modules/sniglets/Sniglets/ServerActions.pm | 2
17 files changed, 78 insertions(+), 116 deletions(-)
---
10 years, 4 months
4 commits - java/code rel-eng/packages spec-tree/tito web/html web/include web/modules
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
rel-eng/packages/tito | 2
spec-tree/tito/0001-fixed-building-third-party-packages.patch | 52 ++++++++++
spec-tree/tito/tito.spec | 4
web/html/network/systems/ssm/errata/index.pxt | 44 --------
web/html/network/systems/ssm/errata/systems_affected.pxt | 42 --------
web/include/nav/ssm.xml | 8 -
web/modules/sniglets/Sniglets/ServerActions.pm | 2
17 files changed, 78 insertions(+), 116 deletions(-)
New commits:
commit f77047c524ad59bb054d10957d11b440434f1f6f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 16:54:09 2013 +0100
Automatic commit of package [tito] minor release [0.4.18-1.4].
diff --git a/rel-eng/packages/tito b/rel-eng/packages/tito
index b7ceac7..ca881bd 100644
--- a/rel-eng/packages/tito
+++ b/rel-eng/packages/tito
@@ -1 +1 @@
-0.4.18-1.3 spec-tree/tito/
+0.4.18-1.4 spec-tree/tito/
diff --git a/spec-tree/tito/tito.spec b/spec-tree/tito/tito.spec
index ccabd9a..295eccf 100644
--- a/spec-tree/tito/tito.spec
+++ b/spec-tree/tito/tito.spec
@@ -2,7 +2,7 @@
Name: tito
Version: 0.4.18
-Release: 1.3%{?dist}
+Release: 1.4%{?dist}
Summary: A tool for managing rpm based git projects
Group: Development/Tools
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 0.4.18-1.3
+* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 0.4.18-1.4
- fixed building third party packages
* Thu Nov 28 2013 Michael Mraka <michael.mraka(a)redhat.com> 0.4.18-1.2
commit 6325e96f75375902faaa504bbbb1f1f8bdcf1680
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 10:52:08 2013 +0100
fixed building third party packages
diff --git a/spec-tree/tito/0001-fixed-building-third-party-packages.patch b/spec-tree/tito/0001-fixed-building-third-party-packages.patch
new file mode 100644
index 0000000..00eb86e
--- /dev/null
+++ b/spec-tree/tito/0001-fixed-building-third-party-packages.patch
@@ -0,0 +1,52 @@
+From 01b9c0b0010a78c0ed203449eacfe44c1d229ba6 Mon Sep 17 00:00:00 2001
+From: Michael Mraka <michael.mraka(a)redhat.com>
+Date: Mon, 16 Dec 2013 10:41:42 +0100
+Subject: [PATCH] fixed building third party packages
+
+do not try to upload files which are not on the disk but in look-aside cache
+
+fixing
+Error running command: rhpkg new-sources /var/tmp/rpmbuild-cobbler-e8869ff6bebf4ac2f981405ebf4c52c9e993db8fDkxF2Y/SOURCES/cobbler-2.0.7/cobbler-2.0.7.tar.gz
+Status code: 256
+Command output: Could not execute new_sources: Path does not exist or is not a file: /var/tmp/rpmbuild-cobbler-e8869ff6bebf4ac2f981405ebf4c52c9e993db8fDkxF2Y/SOURCES/cobbler-2.0.7/cobbler-2.0.7.tar.gz
+Traceback (most recent call last):
+ File "/usr/bin/tito", line 23, in <module>
+ CLI().main(sys.argv[1:])
+ File "/usr/lib/python2.6/site-packages/tito/cli.py", line 94, in main
+ return module.main(argv)
+ File "/usr/lib/python2.6/site-packages/tito/cli.py", line 639, in main
+ scratch=self.options.scratch)
+ File "/usr/lib/python2.6/site-packages/tito/release.py", line 490, in release
+ self._git_release()
+ File "/usr/lib/python2.6/site-packages/tito/release.py", line 512, in _git_release
+ self._git_upload_sources(project_checkout)
+ File "/usr/lib/python2.6/site-packages/tito/release.py", line 685, in _git_upload_sources
+ output = run_command(cmd)
+ File "/usr/lib/python2.6/site-packages/tito/common.py", line 228, in run_command
+ raise RunCommandException("Error running command", command, status, output)
+tito.exception.RunCommandException: Error running command
+---
+ src/tito/builder.py | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/tito/builder.py b/src/tito/builder.py
+index 4442028..ac47a12 100644
+--- a/src/tito/builder.py
++++ b/src/tito/builder.py
+@@ -487,9 +487,11 @@ class NoTgzBuilder(Builder):
+ self.ran_tgz = True
+
+ debug("Scanning for sources.")
+- cmd = "/usr/bin/spectool --list-files '%s' | awk '{print $2}' |xargs -l1 --no-run-if-empty basename " % self.spec_file
++ cmd = "/usr/bin/spectool --list-files --sources '%s' | awk '{print $2}' |xargs -l1 --no-run-if-empty basename " % self.spec_file
+ result = run_command(cmd)
+- self.sources = map(lambda x: os.path.join(self.rpmbuild_gitcopy, x), result.split("\n"))
++ self.sources = [os.path.join(self.rpmbuild_gitcopy, x)
++ for x in result.split("\n")
++ if os.path.exists(os.path.join(self.rpmbuild_gitcopy, x))]
+ debug(" Sources: %s" % self.sources)
+
+ def _get_rpmbuild_dir_options(self):
+--
+1.7.1
+
commit 5e613b298e2c903298843f28e3e16ec2095dd3f6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 16:52:18 2013 +0100
removed unused ssm errata pxt pages
diff --git a/web/html/network/systems/ssm/errata/index.pxt b/web/html/network/systems/ssm/errata/index.pxt
deleted file mode 100644
index 47847b3..0000000
--- a/web/html/network/systems/ssm/errata/index.pxt
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-replacement mode="legend_canvas">
- <rhn-list-legend type="errata" file="/network/components/legends/errata-list-legend.pxi" />
- </grail-canvas-replacement>
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><rhn-icon type="header-system-groups" title="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>Relevant Errata List</h2>
-
- <div class="page-summary">
- <p>The errata below apply to one or more of your selected systems.</p>
- </div>
-
-<rhn-listview class="Sniglets::ListView::ErrataList" mode="relevant_to_system_set">
- <set name="errata applicable to systems in set" label="errata_list" />
-
- <formvars>
- <var name="set_label" type="literal">errata_list</var>
- </formvars>
-
- <column name="Type" label="advisory_icon" width="5%" align="center"/>
- <column name="Advisory" label="advisory_name">
- <url>/rhn/errata/details/Details.do?eid={column:id}</url>
- </column>
- <column name="Synopsis" label="advisory_synopsis" align="left" />
- <column name="Systems" label="affected_system_count" align="center">
- <url>/network/systems/ssm/errata/systems_affected.pxt?eid={column:id}</url>
- </column>
- <column name="Updated" label="advisory_last_updated" align="center" />
- <action name="Apply Errata" label="apply" url="/network/systems/ssm/errata/apply_errata_conf.pxt" />
-</rhn-listview>
-
- </grail-canvas-template>
-
-</pxt-passthrough>
diff --git a/web/html/network/systems/ssm/errata/systems_affected.pxt b/web/html/network/systems/ssm/errata/systems_affected.pxt
deleted file mode 100644
index fd85c75..0000000
--- a/web/html/network/systems/ssm/errata/systems_affected.pxt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pxt-passthrough>
-<pxt-use class="Grail::Frame" />
-<pxt-use class="Sniglets::Users" />
-<pxt-use class="Sniglets::Errata" />
-<pxt-use class="Sniglets::Lists" />
-<pxt-use class="Sniglets::HTML" />
-
-<grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
- <h1><rhn-icon type="header-system-groups" title="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" />
-
-
-<rhn-errata-details>
-<h2><rhn-icon type="header-system"/>
-Selected systems affected by {errata_advisory_name}</h2>
-</rhn-errata-details>
-
-<rhn-listview class="Sniglets::ListView::SystemList" mode="in_set_and_affected_by_errata">
- <formvars>
- <var name="eid" />
- </formvars>
- <column name="Errata" label="total_errata" align="center">
- <url>/rhn/systems/details/ErrataList.do?sid={column:id}</url>
- </column>
-
- <column name="Packages" label="outdated_packages" align="center">
- <url>/rhn/systems/details/packages/UpgradableList.do?sid={column:id}</url>
- </column>
-
- <column name="System" label="server_name" width="50%" align="left">
- <url>/rhn/systems/details/Overview.do?sid={column:id}</url>
- </column>
- <column name="Base Channel" label="channel_labels" align="left" />
- <column name="Entitlement" label="entitlement_level" />
-</rhn-listview>
-
- </grail-canvas-template>
-</pxt-passthrough>
commit c80897333d8f5b74ddd216a72daebf89a4f97809
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 16:39:54 2013 +0100
fixing references to SSM errata page
it's been ported to java in d2343168a2fa34346c3bfa7a2812cf407e39d8ec
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index dd00b6d..a329e12 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5055,8 +5055,8 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>Errata</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Errata-Aktualisierungen einplanen</a>, die relevant für die ausgewählten Systeme sind</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Errata-Aktualisierungen einplanen</a>, die relevant für die ausgewählten Systeme sind</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index bc9f1f9..33e214e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5054,8 +5054,8 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Erratas</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Programar actualización de erratas</a> relevantes a sistemas seleccionados</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Programar actualización de erratas</a> relevantes a sistemas seleccionados</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index e82ea7e..acd0eec 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5055,8 +5055,8 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Errata</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Planifier les mises à jour d'errata</a> correspondant aux systèmes sélectionnés.</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Planifier les mises à jour d'errata</a> correspondant aux systèmes sélectionnés.</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index 15351de..6ef9427 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5054,8 +5054,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Errata</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Programma gli errata update</a> rilevanti ai sistemi selezionati</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Programma gli errata update</a> rilevanti ai sistemi selezionati</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 9cfa328..b33f579 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5056,8 +5056,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>エラータ</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target>選択しているシステムに関連した <a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">エラータの更新をスケジュール</a> します </target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target>選択しているシステムに関連した <a href="/rhn/systems/ssm/ListPatches.do">エラータの更新をスケジュール</a> します </target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 18be1d7..a506314 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5053,8 +5053,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>에라타 </target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target>선택한 시스템에 관련된 <a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">에라타 업데이트 스케줄</a></target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target>선택한 시스템에 관련된 <a href="/rhn/systems/ssm/ListPatches.do">에라타 업데이트 스케줄</a></target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index f3986b2..369e88b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5052,8 +5052,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Errata</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Agendar atualizações de errata</a>referente ao sistema selecionado</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Agendar atualizações de errata</a>referente ao sistema selecionado</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 9687212..b8d4578 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5051,8 +5051,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Исправления</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Настройка установки исправлений</a> в выбранных системах.</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">Настройка установки исправлений</a> в выбранных системах.</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index 1111727..bd71e62 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5054,8 +5054,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>勘误</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">调度勘误更新</a>,这些勘误与所选系统相关。</target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target><a href="/rhn/systems/ssm/ListPatches.do">调度勘误更新</a>,这些勘误与所选系统相关。</target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index f8e4367..fc7b64d 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5051,8 +5051,8 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>勘誤</target>
</trans-unit>
<trans-unit id="ssm.overview.errata.schedule">
- <source><a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">Schedule errata updates</a> relevant to selected systems</source>
- <target>為與已選擇之系統相關的勘誤更新<a href="/network/systems/ssm/errata/index.pxt?pxt:trap=rhn:empty_set&set_label=errata_list">進行排程</a></target>
+ <source><a href="/rhn/systems/ssm/ListPatches.do">Schedule errata updates</a> relevant to selected systems</source>
+ <target>為與已選擇之系統相關的勘誤更新<a href="/rhn/systems/ssm/ListPatches.do">進行排程</a></target>
</trans-unit>
<trans-unit id="ssm.overview.packages">
<source>Packages</source>
diff --git a/web/include/nav/ssm.xml b/web/include/nav/ssm.xml
index 2ed0a6c..ddfcd7d 100644
--- a/web/include/nav/ssm.xml
+++ b/web/include/nav/ssm.xml
@@ -5,12 +5,8 @@
<rhn-tab-url>/rhn/systems/ssm/ListSystems.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="Errata"
- on-click="Sniglets::Lists->navi_empty_set"
- node-id="system_errata_list">
- <rhn-tab-url>/network/systems/ssm/errata/index.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/systems_affected.pxt</rhn-tab-url>
- <rhn-tab-url>/network/systems/ssm/errata/apply_errata_confirm.pxt</rhn-tab-url>
+ <rhn-tab name="Errata">
+ <rhn-tab-url>/rhn/systems/ssm/ListPatches.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Packages">
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index 41c31ff..ee358b6 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -334,7 +334,7 @@ sub server_set_errata_set_actions_cb {
$pxt->push_message(site_info => "Errata updates scheduled.");
- $pxt->redirect('/network/systems/ssm/errata/index.pxt');
+ $pxt->redirect('/rhn/systems/ssm/ListPatches.do');
}
10 years, 4 months
Changes to 'refs/tags/spacewalk-config-2.1.3-1'
by Michael Mraka
Tag 'spacewalk-config-2.1.3-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-16 15:14 +0000
Tagging package [spacewalk-config] version [2.1.3-1] in directory [spacewalk/config/].
Changes since spacewalk-branding-2.1.15-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-config] release [2.1.3-1].
---
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
10 years, 4 months
rel-eng/packages spacewalk/config
by Michael Mraka
rel-eng/packages/spacewalk-config | 2 +-
spacewalk/config/spacewalk-config.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 076ebfa8d539c278a82b5c7437b367368771e3ff
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 16:14:14 2013 +0100
Automatic commit of package [spacewalk-config] release [2.1.3-1].
diff --git a/rel-eng/packages/spacewalk-config b/rel-eng/packages/spacewalk-config
index b456de2..01f58a2 100644
--- a/rel-eng/packages/spacewalk-config
+++ b/rel-eng/packages/spacewalk-config
@@ -1 +1 @@
-2.1.2-1 spacewalk/config/
+2.1.3-1 spacewalk/config/
diff --git a/spacewalk/config/spacewalk-config.spec b/spacewalk/config/spacewalk-config.spec
index a0d0b28..5087dfd 100644
--- a/spacewalk/config/spacewalk-config.spec
+++ b/spacewalk/config/spacewalk-config.spec
@@ -1,6 +1,6 @@
Name: spacewalk-config
Summary: Spacewalk Configuration
-Version: 2.1.2
+Version: 2.1.3
Release: 1%{?dist}
URL: http://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -104,6 +104,11 @@ chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
%changelog
+* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.3-1
+- Remove groups/errata_list.pxt
+- system group edit properties - linking + cleanup
+- system group details - linking + cleanup
+
* Tue Sep 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.2-1
- Updating rhn.conf man page for taskomatic.maxmemory option
- Changes to rhn.conf man page for ISS settings
10 years, 4 months
Changes to 'refs/tags/spacewalk-branding-2.1.15-1'
by Michael Mraka
Tag 'spacewalk-branding-2.1.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-16 15:13 +0000
Tagging package [spacewalk-branding] version [2.1.15-1] in directory [branding/].
Changes since spacewalk-web-2.1.43-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-branding] release [2.1.15-1].
---
branding/spacewalk-branding.spec | 8 +++++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
10 years, 4 months
branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/spacewalk-branding.spec | 8 +++++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit d25c4cd851e129c83ec897c11d3893d220f2af8c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 16 16:13:34 2013 +0100
Automatic commit of package [spacewalk-branding] release [2.1.15-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index cb4574a..a38b716 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.14
+Version: 2.1.15
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -82,6 +82,12 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Mon Dec 16 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.15-1
+- making help links disappear
+- colour added to the counter in SSM
+- Links inside a alert-info have a darker blue than the text shown and have
+ underline. It is necessary to distinguish the link over the general text
+
* Fri Dec 13 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.14-1
- replaced icons with icon tag
- updated pxt pages to use <rhn-icon> tag
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 8587c0b..b375395 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.14-1 branding/
+2.1.15-1 branding/
10 years, 4 months