2 commits - java/code spacewalk/config web/html
by Jan Dobes
java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java | 88 -----
java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java | 170 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 11
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 2
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 2
java/code/webapp/WEB-INF/pages/groups/create.jsp | 67 ---
java/code/webapp/WEB-INF/pages/groups/detail.jsp | 2
java/code/webapp/WEB-INF/pages/groups/edit.jsp | 86 +++++
java/code/webapp/WEB-INF/pages/systems/grouplist.jsp | 2
java/code/webapp/WEB-INF/struts-config.xml | 18 -
spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf | 6
web/html/network/systems/groups/edit_properties.pxt | 56 ---
21 files changed, 289 insertions(+), 240 deletions(-)
New commits:
commit a0c2650fe40f7a9927b125771b175d72dc2916f4
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Dec 12 11:08:17 2013 +0100
system group edit properties - linking + cleanup
diff --git a/java/code/webapp/WEB-INF/pages/groups/detail.jsp b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
index 8816d20..cb60828 100644
--- a/java/code/webapp/WEB-INF/pages/groups/detail.jsp
+++ b/java/code/webapp/WEB-INF/pages/groups/detail.jsp
@@ -80,7 +80,7 @@
<div class="panel-heading">
<h3><bean:message key="systemgroup.details.properties"/>
<rhn:require acl="user_role(org_admin) or user_role(system_group_admin)">
- (<a href="/network/systems/groups/edit_properties.pxt?sgid=${id}"><bean:message key="systemgroup.details.editproperties"/></a>)
+ (<a href="/rhn/groups/EditGroup.do?sgid=${id}"><bean:message key="systemgroup.details.editproperties"/></a>)
</rhn:require></h3>
</div>
diff --git a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
index de4a5f4..cc39758 100644
--- a/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
+++ b/spacewalk/config/etc/httpd/conf.d/zz-spacewalk-www.conf
@@ -139,12 +139,6 @@ PerlConfigRequire PXT/Apache24Config.pm
require acl user_role(system_group_admin); user_has_access_to_servergroup()
</Files>
- <Files edit_properties.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
- require acl user_role(system_group_admin); user_has_access_to_servergroup()
- </Files>
-
<Files errata_list.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
diff --git a/web/html/network/systems/groups/edit_properties.pxt b/web/html/network/systems/groups/edit_properties.pxt
deleted file mode 100644
index a2a8df1..0000000
--- a/web/html/network/systems/groups/edit_properties.pxt
+++ /dev/null
@@ -1,56 +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::ServerGroup" />
- <pxt-use class="Sniglets::Lists" />
- <pxt-use class="Sniglets::Navi" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<pxt-include file="/network/components/system_groups/sgdc_header.pxi" />
-
-<rhn-require acl="user_role(system_group_admin)">
-
-<pxt-include-late file="/network/components/message_queues/local.pxi" />
-
- <pxt-form method="post">
-
-<rhn-admin-server-group-edit-form>
-
- <h2>System Group Details</h2>
- <table class="details">
- <tr>
- <th>Name:</th>
- <td>
- <input type="text" name="name" value="{name}" maxlength="64"/>
- </td>
- </tr>
-
- <tr>
- <th valign="top">Description:</th>
- <td>
- <textarea wrap="virtual" rows="3" cols="35" name="description">{description}</textarea>
- </td>
- </tr>
- </table>
-
- <div align="right">
- <hr />
- <input type="submit" value="Modify Details" />
- </div>
-
- {admin_server_group_formvars}
- <pxt-formvar>
- <input type="hidden" name="redirect_to" value="/rhn/groups/GroupDetail.do?sgid={formvar:sgid}" />
- </pxt-formvar>
-</rhn-admin-server-group-edit-form>
-
- </pxt-form>
-
-</rhn-require>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
commit e4d32553d6947160cc12550b267f9bb0ef99011b
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Dec 10 11:50:51 2013 +0100
alter system group create page to do editing
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
deleted file mode 100644
index 384d41b..0000000
--- a/java/code/src/com/redhat/rhn/frontend/action/groups/CreateGroupAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Copyright (c) 2009--2012 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.action.groups;
-
-import com.redhat.rhn.domain.server.ManagedServerGroup;
-import com.redhat.rhn.domain.server.ServerGroupFactory;
-import com.redhat.rhn.domain.user.User;
-import com.redhat.rhn.frontend.struts.RequestContext;
-import com.redhat.rhn.frontend.struts.RhnAction;
-import com.redhat.rhn.frontend.struts.RhnHelper;
-import com.redhat.rhn.manager.system.ServerGroupManager;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.DynaActionForm;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-
-/**
- * @author paji
- * @version $Rev$
- */
-public class CreateGroupAction extends RhnAction {
-
- /** {@inheritDoc} */
- public ActionForward execute(ActionMapping mapping,
- ActionForm form,
- HttpServletRequest request,
- HttpServletResponse response) {
-
- RequestContext context = new RequestContext(request);
- User user = context.getLoggedInUser();
- DynaActionForm daForm = (DynaActionForm)form;
- Boolean errors = false;
-
- if (isSubmitted(daForm)) {
- String name = daForm.getString("name");
- String desc = daForm.getString("description");
-
- if (StringUtils.isEmpty(name) || StringUtils.isEmpty(desc)) {
- request.setAttribute("emptynameordesc", "1");
- errors = true;
- }
-
- ManagedServerGroup newGroup = ServerGroupFactory.lookupByNameAndOrg(name,
- user.getOrg());
-
- if (newGroup != null) {
- request.setAttribute("alreadyexists", "1");
- errors = true;
- }
-
- if (!errors) {
- ServerGroupManager manager = ServerGroupManager.getInstance();
- ManagedServerGroup sg = manager.create(user, name, desc);
-
- createSuccessMessage(request, "systemgroups.create.successmessage", name);
-
- return mapping.findForward("success");
- }
- request.setAttribute("name", daForm.getString("name"));
- request.setAttribute("description",
- daForm.getString("description"));
-
- return mapping.findForward("error");
- }
-
- return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
- }
-
-}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java b/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java
new file mode 100644
index 0000000..89ff426
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/groups/EditGroupAction.java
@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) 2009--2013 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.action.groups;
+
+import java.util.Map;
+
+import com.redhat.rhn.domain.server.ManagedServerGroup;
+import com.redhat.rhn.domain.server.ServerGroupFactory;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.manager.system.ServerGroupManager;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @author paji
+ * @version $Rev$
+ */
+public class EditGroupAction extends RhnAction {
+
+ /** {@inheritDoc} */
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+
+ DynaActionForm daForm = (DynaActionForm)form;
+ ActionErrors errors = new ActionErrors();
+ Map params = makeParamMap(request);
+ RequestContext ctx = new RequestContext(request);
+
+ if (ctx.hasParam("sgid")) {
+ params.put("sgid", ctx.getParam("sgid", true));
+ }
+
+ if (!isSubmitted(daForm)) {
+ setupForm(request, daForm);
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ params);
+ }
+
+ // process values - create or update
+ if (ctx.hasParam("create_button")) {
+ Long sgid = create(daForm, errors, ctx);
+ params.put("sgid", sgid);
+ }
+ else if (ctx.hasParam("edit_button")) {
+ edit(daForm, errors, ctx);
+ }
+
+ if (!errors.isEmpty()) {
+ addErrors(request, errors);
+ request.setAttribute("name", daForm.get("name"));
+ request.setAttribute("description", daForm.get("description"));
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward(RhnHelper.DEFAULT_FORWARD),
+ params);
+ }
+
+ if (ctx.hasParam("create_button")) {
+ createSuccessMessage(request,
+ "systemgroups.create.successmessage", daForm.getString("name"));
+ }
+ else if (ctx.hasParam("edit_button")) {
+ createSuccessMessage(request,
+ "systemgroups.edit.successmessage", daForm.getString("name"));
+ }
+
+
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"), params);
+ }
+
+ private void setupForm(HttpServletRequest request, DynaActionForm form) {
+
+ RequestContext ctx = new RequestContext(request);
+ Long sgid = ctx.getParamAsLong("sgid");
+
+ // editing form - prefill values
+ if (sgid != null) {
+ ManagedServerGroup sg = ctx.lookupAndBindServerGroup();
+ form.set("name", sg.getName());
+ form.set("description", sg.getDescription());
+ }
+ }
+
+ private Long create(DynaActionForm form, ActionErrors errors,
+ RequestContext ctx) {
+
+ validate(form, errors, ctx);
+
+ if (errors.isEmpty()) {
+ ServerGroupManager manager = ServerGroupManager.getInstance();
+ ManagedServerGroup sg = manager.create(ctx.getLoggedInUser(),
+ form.getString("name"), form.getString("description"));
+
+ return sg.getId();
+ }
+
+ return null;
+ }
+
+ private void edit(DynaActionForm form, ActionErrors errors,
+ RequestContext ctx) {
+
+ validate(form, errors, ctx);
+
+ if (errors.isEmpty()) {
+ ManagedServerGroup sg = ctx.lookupAndBindServerGroup();
+ sg.setName(form.getString("name"));
+ sg.setDescription(form.getString("description"));
+ ServerGroupFactory.save(sg);
+ }
+ }
+
+ private void validate(DynaActionForm form, ActionErrors errors,
+ RequestContext ctx) {
+
+ String name = form.getString("name");
+ String desc = form.getString("description");
+ Long sgid = ctx.getParamAsLong("sgid");
+
+ // Check if both values are entered
+ if (StringUtils.isEmpty(name) || StringUtils.isEmpty(desc)) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("systemgroup.create.requirements"));
+ }
+
+ // Check if sg already exists
+ ManagedServerGroup newGroup = ServerGroupFactory.lookupByNameAndOrg(name,
+ ctx.getLoggedInUser().getOrg());
+
+ // Ugly condition for two error cases:
+ // creating page + group name exists
+ // editing page + group name exists except our group
+ if (((sgid == null) && (newGroup != null)) ||
+ (sgid != null) && (newGroup != null) && (!sgid.equals(newGroup.getId()))) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("systemgroup.create.alreadyexists"));
+ }
+
+ }
+
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 88f9c93..83109a3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -2925,6 +2925,9 @@ user before attempting to deactivate their account.</source>
<trans-unit id="systemgroups.create.successmessage">
<source>System group {0} created.</source>
</trans-unit>
+ <trans-unit id="systemgroups.edit.successmessage">
+ <source>System group {0} updated.</source>
+ </trans-unit>
<trans-unit id="probe.empty.status">
<source>No status for probe</source>
<context-group name="ctx">
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 81b5b6b..dd00b6d 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
@@ -6060,7 +6060,7 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</source>
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 c83168e..6be4b99 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
@@ -5315,14 +5315,20 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</source>
</trans-unit>
+ <trans-unit id="systemgroup.edit.header">
+ <source>Edit System Group</source>
+ </trans-unit>
<trans-unit id="systemgroup.create.summary">
<source>Create a system group using the form provided. Note that the group will be empty until systems are joined to it. Entries marked with an asterisk (<span class="required-form-field">*</span>) are <strong>required</strong>.</source>
</trans-unit>
+ <trans-unit id="systemgroup.edit.summary">
+ <source>Update group properties using the form provided. Entries marked with an asterisk (<span class="required-form-field">*</span>) are <strong>required</strong>.</source>
+ </trans-unit>
<trans-unit id="systemgroup.create.requiredfield">
<source>Required Field</source>
</trans-unit>
@@ -5341,6 +5347,9 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="systemgroup.create.creategroup">
<source>Create Group</source>
</trans-unit>
+ <trans-unit id="systemgroup.edit.editgroup">
+ <source>Update Group</source>
+ </trans-unit>
</group>
<!--System Entitlements Page - entitlements.jsp -->
<trans-unit id="systementitlements.jsp.header">
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 3ba20ee..bc9f1f9 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
@@ -6059,7 +6059,7 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 a7b32bd..e82ea7e 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
@@ -6060,7 +6060,7 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 9354a5f..15351de 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
@@ -6059,7 +6059,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 f67349a..9cfa328 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
@@ -6061,7 +6061,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 a909ae3..18be1d7 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
@@ -6058,7 +6058,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 af9fadb..f3986b2 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
@@ -6057,7 +6057,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 946aa1f..9687212 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
@@ -6056,7 +6056,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 a6220cb..1111727 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
@@ -6059,7 +6059,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</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 4102afc..f8e4367 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
@@ -6056,7 +6056,7 @@ value for this entitlement, excluding the default organization's consumption.</s
</group>
<group>
<context-group name="ctx">
- <context context-type="sourcefile">/rhn/groups/CreateGroup.do</context>
+ <context context-type="sourcefile">/rhn/groups/EditGroup.do</context>
</context-group>
<trans-unit id="systemgroup.create.header">
<source>Create System Group</source>
diff --git a/java/code/webapp/WEB-INF/pages/groups/create.jsp b/java/code/webapp/WEB-INF/pages/groups/create.jsp
deleted file mode 100644
index 6535da1..0000000
--- a/java/code/webapp/WEB-INF/pages/groups/create.jsp
+++ /dev/null
@@ -1,67 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
-
-<html>
- <body>
- <h1>
- <i class="fa spacewalk-icon-system-groups" title="system group"></i>
- <bean:message key="systemgroup.create.header"/>
- <a href="/rhn/help/reference/en-US/s1-sm-systems.jsp#s3-sm-system-group-creation" target="_blank" class="help-title">
- <i class="fa fa-question-circle" title="Help Icon"></i>
- </a>
- </h1>
- <p><bean:message key="systemgroup.create.summary"/></p>
- <c:if test="${not empty emptynameordesc}">
- <div class="local-alert"><bean:message key="systemgroup.create.requirements"/><br /></div>
- </c:if>
- <c:if test="${not empty alreadyexists}">
- <div class="local-alert"><bean:message key="systemgroup.create.alreadyexists"/><br /></div>
- </c:if>
- <html:form method="post"
- action="/groups/CreateGroup.do"
- styleClass="form-horizontal">
- <rhn:csrf />
- <html:hidden property="submitted" value="true"/>
-
- <div class="form-group">
- <label class="col-lg-3 control-label" for="name">
- <bean:message key="systemgroup.create.name"/>
- <span class="required-form-field">*</span>:
- </label>
- <div class="col-lg-6">
- <html:text property="name" size="30" styleId="name"
- maxlength="64" styleClass="form-control" />
- </div>
- </div>
- <div class="form-group">
- <label class="col-lg-3 control-label" for="description">
- <bean:message key="systemgroup.create.description" />
- <span class="required-form-field">*</span>:
- </label>
- <div class="col-lg-6">
- <html:textarea property="description" cols="40"
- styleClass="form-control"
- rows="4" styleId="description"/>
- </div>
- </div>
-
- <%--
- <div class="text-right">
- <hr />
- <input type="hidden" name="pxt:trap" value="rhn:server_group_create_cb" />
- <input type="hidden" name="redirect_to" value="/rhn/systems/SystemGroupList.do" />
- <input type="submit" name="make_group" value="<bean:message key='systemgroup.create.creategroup'/>" />
- --%>
-
- <div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <html:submit styleClass="btn btn-success">
- <bean:message key="systemgroup.create.creategroup"/>
- </html:submit>
- </div>
- </div>
- </html:form>
- </body>
-</html>
\ No newline at end of file
diff --git a/java/code/webapp/WEB-INF/pages/groups/edit.jsp b/java/code/webapp/WEB-INF/pages/groups/edit.jsp
new file mode 100644
index 0000000..20589fa
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/groups/edit.jsp
@@ -0,0 +1,86 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+
+<html>
+ <body>
+ <h1>
+ <i class="fa spacewalk-icon-system-groups" title="system group"></i>
+ <c:choose>
+ <c:when test='${empty param.sgid}'>
+ <bean:message key="systemgroup.create.header"/>
+ </c:when>
+ <c:otherwise>
+ <bean:message key="systemgroup.edit.header"/>
+ </c:otherwise>
+ </c:choose>
+ </h1>
+ <p>
+ <c:choose>
+ <c:when test='${empty param.sgid}'>
+ <bean:message key="systemgroup.create.summary"/>
+ </c:when>
+ <c:otherwise>
+ <bean:message key="systemgroup.edit.summary"/>
+ </c:otherwise>
+ </c:choose>
+ </p>
+ <html:form method="post"
+ action="/groups/EditGroup.do"
+ styleClass="form-horizontal">
+ <rhn:csrf />
+
+ <div class="form-group">
+ <label class="col-lg-3 control-label" for="name">
+ <bean:message key="systemgroup.create.name"/>
+ <span class="required-form-field">*</span>:
+ </label>
+ <div class="col-lg-6">
+ <html:text property="name" size="30" styleId="name"
+ maxlength="64" styleClass="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-lg-3 control-label" for="description">
+ <bean:message key="systemgroup.create.description" />
+ <span class="required-form-field">*</span>:
+ </label>
+ <div class="col-lg-6">
+ <html:textarea property="description" cols="40"
+ styleClass="form-control"
+ rows="4" styleId="description"/>
+ </div>
+ </div>
+
+ <%--
+ <div class="text-right">
+ <hr />
+ <input type="hidden" name="pxt:trap" value="rhn:server_group_create_cb" />
+ <input type="hidden" name="redirect_to" value="/rhn/systems/SystemGroupList.do" />
+ <input type="submit" name="make_group" value="<bean:message key='systemgroup.create.creategroup'/>" />
+ --%>
+
+ <div class="form-group">
+ <div class="col-lg-offset-3 col-lg-6">
+ <c:choose>
+ <c:when test='${empty param.sgid}'>
+ <html:submit property="create_button" styleClass="btn btn-success">
+ <bean:message key="systemgroup.create.creategroup"/>
+ </html:submit>
+ </c:when>
+ <c:otherwise>
+ <html:submit property="edit_button" styleClass="btn btn-success">
+ <bean:message key="systemgroup.edit.editgroup"/>
+ </html:submit>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <html:hidden property="submitted" value="true" />
+ <c:if test='${not empty param.sgid}'>
+ <html:hidden property="sgid" value="${param.sgid}" />
+ </c:if>
+ </html:form>
+ </body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
index 4062520..1b96095 100644
--- a/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/grouplist.jsp
@@ -12,7 +12,7 @@
<body>
<rhn:toolbar base="h1" icon="header-system-groups" imgAlt="system.common.groupAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-group-list"
- creationUrl="/rhn/groups/CreateGroup.do"
+ creationUrl="/rhn/groups/EditGroup.do"
creationType="group"
creationAcl="user_role(system_group_admin)">
<bean:message key="grouplist.jsp.header"/>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 6ce376e..47e5539 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1165,7 +1165,7 @@
<form-property name="submitted" type="java.lang.Boolean" />
</form-bean>
- <form-bean name="createSystemGroupForm"
+ <form-bean name="editSystemGroupForm"
type="com.redhat.rhn.frontend.struts.ScrubbingDynaActionForm" >
<form-property name="name" type="java.lang.String" />
<form-property name="description" type="java.lang.String" />
@@ -3917,20 +3917,18 @@
redirect="true" />
</action>
- <action path="/groups/CreateGroup"
+ <action path="/groups/EditGroup"
scope="request"
- type="com.redhat.rhn.frontend.action.groups.CreateGroupAction"
- input="/WEB-INF/pages/groups/create.jsp"
- parameter="dispatch"
- name="createSystemGroupForm"
+ type="com.redhat.rhn.frontend.action.groups.EditGroupAction"
+ name="editSystemGroupForm"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <set-property property="acls"
+ value="user_role(system_group_admin)"/>
<set-property property="postRequiredIfSubmitted" value="true" />
<forward name="default"
- path="/WEB-INF/pages/groups/create.jsp" />
- <forward name="error"
- path="/WEB-INF/pages/groups/create.jsp" />
+ path="/WEB-INF/pages/groups/edit.jsp" />
<forward name="success"
- path="/systems/SystemGroupList.do"
+ path="/groups/GroupDetail.do"
redirect="true" />
</action>
10 years, 5 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d7ddddc20faed2bcf9f1f0941a0d4b7a0f58fe67
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 10:44:57 2013 +0100
system group legend needs rhn taglib
diff --git a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
index be4d95d..ebc2d39 100644
--- a/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/system-group-legend.jsp
@@ -1,4 +1,5 @@
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<div class="sideleg">
<h4><bean:message key="system-group-legend.jsp.title"/></h4>
10 years, 5 months
4 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 3 +++
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf | 2 +-
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf | 8 ++++----
java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp | 4 +++-
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp | 6 ++----
java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp | 4 +++-
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp | 6 +++---
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp | 5 +++--
java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp | 2 +-
java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp | 2 +-
22 files changed, 42 insertions(+), 36 deletions(-)
New commits:
commit 80a9ed9fd6fde3eac3b545a8e1debd981d514e3b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 07:30:32 2013 +0100
use rhn:toolbar tag instead of creating html inside .jsp + unify icons
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 a410708..393821b 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -52,6 +52,8 @@ public class IconTag extends TagSupport {
icons.put("header-action", "fa-clock-o");
icons.put("header-activation-key", "fa fa-key");
icons.put("header-channel", "fa spacewalk-icon-software-channels");
+ icons.put("header-channel-configuration",
+ "fa spacewalk-icon-Software-Channel-Management");
icons.put("header-channel-mapping", "fa fa-retweet");
icons.put("header-configuration", "fa spacewalk-icon-manage-configuration-files");
icons.put("header-crash", "spacewalk-icon-bug-ex");
diff --git a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
index 4f2e6f2..e487e66 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/overview/globalconfiglist.jsp
@@ -9,7 +9,7 @@
<meta name="page-decorator" content="none" />
</head>
<body>
-<rhn:toolbar base="h1" icon="header-configuration"
+<rhn:toolbar base="h1" icon="header-channel-configuration"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-central"
creationUrl="/rhn/configuration/ChannelCreate.do?editing=true"
creationType="configchannel"
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
index 77cad50..9dd03f5 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/channellist.jsp
@@ -12,9 +12,9 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><img src="${cfg:channelHeaderIcon('central')}"
- alt="${cfg:channelAlt('central')}"/>
-<bean:message key="sdc.configlist.jsp.header"/></h2>
+<rhn:toolbar base="h2" icon="header-channel-configuration">
+ <bean:message key="sdc.configlist.jsp.header"/>
+</rhn:toolbar>
<div class="page-summary">
<p><bean:message key="sdc.configlist.jsp.para1"/></p>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
index b392250..0091174 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/createfile.jsp
@@ -11,7 +11,9 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><bean:message key="sdccreatefile.jsp.header"/></h2>
+<rhn:toolbar base="h2" icon="header-configuration">
+ <bean:message key="sdccreatefile.jsp.header"/>
+</rhn:toolbar>
<div class="page-summary">
<p>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
index fabd669..4e9b94a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfile.jsp
@@ -12,7 +12,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="header-system"
+ icon="header-configuration"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdeployfile.jsp.header"
arg0="${system.name}"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
index 14c35c0..75ea216 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="header-system"
+ icon="header-configuration"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdifffile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
index 9ccc96c..95f019e 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2"
- icon="header-system"
+ icon="header-configuration"
imgAlt="system.common.systemAlt">
<bean:message key="sdcimportfile.jsp.header"
arg0="${fn:escapeXml(system.name)}"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
index 0d3dc3e..a2c80bc 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/rankchannels.jsp
@@ -14,11 +14,9 @@
action="/systems/details/configuration/RankChannels.do?sid=${param.sid}">
<rhn:csrf />
<rhn:submitted />
- <h2>
- <img src="${cfg:channelHeaderIcon('central')}"
- alt="${cfg:channelAlt('central')}"/>
+ <rhn:toolbar base="h2" icon="header-channel-configuration">
<bean:message key="sdc.config.rank.jsp.header"/>
- </h2>
+ </rhn:toolbar>
<c:if test="${not empty param.wizard_mode}">
<h3><bean:message key="ssm.config.rank.jsp.step"/></h3>
<input type="hidden" name="wizard_mode" value="true"/>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
index 1f4a12b..c0db434 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/subscriptions.jsp
@@ -11,9 +11,9 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2> <img src="${cfg:channelHeaderIcon('central')}"
- alt="${cfg:channelAlt('central')}"/>
- <bean:message key="sdc.config.subscriptions.jsp.header"/></h2>
+<rhn:toolbar base="h2" icon="header-channel-configuration">
+ <bean:message key="sdc.config.subscriptions.jsp.header"/>
+</rhn:toolbar>
<h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3>
<p><bean:message key="sdc.config.subscriptions.jsp.para1" /></p>
<noscript>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
index 0719521..661298a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/uploadfile.jsp
@@ -9,7 +9,9 @@
</head>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
- <h2><bean:message key="sdcuploadfile.jsp.header"/></h2>
+ <rhn:toolbar base="h2" icon="header-configuration">
+ <bean:message key="sdcuploadfile.jsp.header"/>
+ </rhn:toolbar>
<div class="page-summary">
<p><bean:message key="sdcuploadfile.jsp.summary"/></p>
</div>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
index 3669d07..475d8be 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
@@ -9,9 +9,9 @@
</head>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-
-<h2><img class="h2-image" src="${cfg:channelHeaderIcon('central')}"/>
-<bean:message key="sdc.config.header.overview"/></h2>
+<rhn:toolbar base="h2" icon="header-configuration">
+ <bean:message key="sdc.config.header.overview"/>
+</rhn:toolbar>
<p>
<bean:message key="sdc.config.file_list.central_description"
arg0="${fn:escapeXml(requestScope.system.name)}"/>
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 02f3c31..4c289fd 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfileslocal.jsp
@@ -9,9 +9,9 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><img class="h2-image" src="${cfg:channelHeaderIcon('local')}"
- alt="${cfg:channelAlt('local')}"/>
- <bean:message key="sdc.config.header.overview"/></h2>
+<rhn:toolbar base="h2" icon="header-configuration">
+ <bean:message key="sdc.config.header.overview"/>
+</rhn:toolbar>
<p><bean:message key="sdc.config.file_list.local_description"/></p>
<rl:listset name="fileSet">
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
index 27e0278..5918ab8 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
@@ -9,8 +9,9 @@
</head>
<body>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
-<h2><img class="h2-image" src="${cfg:channelHeaderIcon('sandbox')}"/>
-<bean:message key="sdc.config.header.overview"/></h2>
+<rhn:toolbar base="h2" icon="header-configuration">
+ <bean:message key="sdc.config.header.overview"/>
+</rhn:toolbar>
<p><bean:message key="sdc.config.file_list.sandbox_description"
arg0="${fn:escapeXml(requestScope.system.name)}"
arg1="${rhn:localize('sdc.config.file_list.copy_to_global')}"/></p>
commit d33de346cd7744a9a94f0c6dd5a22839684a1bf5
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 07:21:17 2013 +0100
fix icons on config file details page
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
index 08de35d..c25d760 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
@@ -14,8 +14,8 @@
<c:set var="helpUrl" scope="request" value="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-files-local" />
<c:set var="downloadUrl" scope="request" value="/rhn/configuration/file/FileDownload.do?crid=${revision.id}&cfid=${file.id}" />
<c:set var="deleteUrl" scope="request" value="/rhn/configuration/file/DeleteRevision.do?crid=${revision.id}&cfid=${file.id}" />
-<c:set var="fileIcon" scope="request" value="icon-file-text" />
-<c:set var="dirIcon" scope="request" value="icon-folder-open-alt" />
+<c:set var="fileIcon" scope="request" value="header-configuration" />
+<c:set var="dirIcon" scope="request" value="header-configuration" />
<c:set var="toolbarText" scope="request">
<bean:message key="filedetails.header.jspf.label"
arg0="${fn:escapeXml(file.configFileName.path)}" arg1="${revision.revision}"
commit 518a8897664d41fce356e6f52dd04e1df680cd99
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 07:12:22 2013 +0100
icon for file download
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 1cae70a..a410708 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java
@@ -77,6 +77,7 @@ public class IconTag extends TagSupport {
icons.put("item-add", "fa fa-plus");
icons.put("item-clone", "fa fa-files-o");
icons.put("item-del", "fa fa-trash-o");
+ icons.put("item-download", "fa fa-download");
icons.put("item-ssm-add", "fa fa-plus-circle");
icons.put("item-ssm-del", "fa fa-minus-circle");
icons.put("monitoring-crit", "fa fa-1-5x spacewalk-icon-health text-danger");
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
index 153628d..08de35d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/header.jspf
@@ -35,7 +35,7 @@
icon="${fileIcon}"
helpUrl="${helpUrl}"
miscUrl="${downloadUrl}"
- miscIcon="icon-download-alt"
+ miscIcon="item-download"
miscText="filedetails.header.jspf.download">
${toolbarText}
</rhn:toolbar>
@@ -47,7 +47,7 @@
deletionType="configfile"
deletionAcl="config_channel_editable(${channel.id})"
miscUrl="${downloadUrl}"
- miscIcon="icon-download-alt"
+ miscIcon="item-download"
miscText="filedetails.header.jspf.download"
aclMixins="com.redhat.rhn.common.security.acl.ConfigAclHandler">
${toolbarText}
commit 9eda32565a4700cebcc8893e468064bc8938f30b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Dec 12 06:35:41 2013 +0100
unify configuration management icons
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
index 0046fd4..7451e6f 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/details-header.jspf
@@ -7,7 +7,7 @@
<c:choose>
<c:when test='${channel != null}'>
<c:if test="${channel.globalChannel}">
- <rhn:toolbar base="h1" icon="spacewalk-icon-channels-config"
+ <rhn:toolbar base="h1" icon="header-configuration"
iconAlt="config.common.globalAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#config-config-channels-channel-details"
deletionUrl="/rhn/configuration/DeleteChannel.do?ccid=${ccid}"
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
index 500230c..597ba00 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/channelcreate.jsp
@@ -8,7 +8,7 @@
<html>
<body>
- <rhn:toolbar base="h1" icon="spacewalk-icon-channels-config"
+ <rhn:toolbar base="h1" icon="header-configuration"
iconAlt="config.common.globalAlt"
helpUrl="/rhn/help/reference/en-US/s1-sm-configuration.jsp#configuration-channels">
<bean:message key="channelOverview.jsp.newToolbar" />
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
index 6f6d3e1..4694004 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/rankchannels.jsp
@@ -13,7 +13,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="ssm.config.rank.jsp.header" />
</h2>
<h3><bean:message key="ssm.config.rank.jsp.step"/></h3>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
index a4d288b..c08472a 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribe.jsp
@@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="ssm.config.subscribe.jsp.header"/>
</h2>
<h3><bean:message key="ssm.config.subscribe.jsp.step"/></h3>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
index e0faae5..9d6164c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/subscribeconfirm.jsp
@@ -11,7 +11,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="ssm.config.subscribeconfirm.jsp.header"/>
</h2>
<h3><bean:message key="ssm.config.subscribeconfirm.jsp.step"/></h3>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
index e3560b5..6d115d4 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/systemchannels.jsp
@@ -8,7 +8,7 @@
<body>
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="ssmsystemchannels.jsp.header" />
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
index afc17fe..b9a0d3c 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribe.jsp
@@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="unsubscribe.jsp.header"/>
</h2>
diff --git a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
index fdc80f6..cbbaf50 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/ssm/unsubscribeconfirm.jsp
@@ -9,7 +9,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/ssm/header.jspf" %>
<h2>
- <i class="fa spacewalk-icon-channels-config" title="<bean:message key="config.common.channelsAlt" />"></i>
+ <rhn:icon type="header-configuration" title="<bean:message key='config.common.channelsAlt' />" />
<bean:message key="unsubscribeconfirm.jsp.header"/>
</h2>
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.97-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-2.1.97-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-12-11 16:09 +0000
Tagging package [spacewalk-java] version [2.1.97-1] in directory [java/].
Changes since spacewalk-java-2.1.96-1:
Tomas Kasparek (2):
use new icon aliases in more places
Automatic commit of package [spacewalk-java] release [2.1.97-1].
---
java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 10 +++++-----
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 6 +++---
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 4 ++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
5 files changed, 15 insertions(+), 12 deletions(-)
---
10 years, 5 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0fbff1be6003f6493a8740e0cb2f7271911074c0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 11 17:09:17 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.97-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5a93ad9..0b492a1 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.96
+Version: 2.1.97
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 11 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.97-1
+- use new icon aliases in more places
+
* Wed Dec 11 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.96-1
- allow channel administrator to view Channel > Managers page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index f7170be..a4cd024 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.96-1 java/
+2.1.97-1 java/
10 years, 5 months
java/code
by Tomáš Kašpárek
java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 10 +++++-----
java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 6 +++---
java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 727fa659a44aeb7366f3006dcf413acf0ab7dfbe
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Dec 11 16:40:27 2013 +0100
use new icon aliases in more places
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
index a4342f7..e16cd2d 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf
@@ -11,25 +11,25 @@
<c:when test="${!inSSM}">
<c:set var="actionLink" value="/rhn/systems/details/AddToSSM.do?sid=${system.id}"/>
<c:set var="actionMessage" value="toolbar.ssm.add"/>
- <c:set var="actionIcon" value="fa-plus-circle"/>
+ <c:set var="actionIcon" value="item-ssm-add"/>
</c:when>
<c:otherwise>
<c:set var="actionLink" value="/rhn/systems/details/RemoveFromSSM.do?sid=${system.id}"/>
<c:set var="actionMessage" value="toolbar.ssm.remove"/>
- <c:set var="actionIcon" value="fa-times-circle-o"/>
+ <c:set var="actionIcon" value="item-ssm-del"/>
</c:otherwise>
</c:choose>
</rhn:require>
<c:choose>
<c:when test="${system.virtualGuest}">
- <c:set var="systemIcon" value="spacewalk-icon-virtual-guest"/>
+ <c:set var="systemIcon" value="header-system-virt-guest"/>
</c:when>
<c:when test="${system.virtualHost}">
- <c:set var="systemIcon" value="spacewalk-icon-virtual-host"/>
+ <c:set var="systemIcon" value="header-system-virt-host"/>
</c:when>
<c:otherwise>
- <c:set var="systemIcon" value="fa-desktop"/>
+ <c:set var="systemIcon" value="header-system-physical"/>
</c:otherwise>
</c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
index ba1d606..534fdea 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf
@@ -1,13 +1,13 @@
<c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">" escapeXml="false" />
<c:choose>
<c:when test="${current.virtualGuest && empty nosystemicons}">
- <i class="fa spacewalk-icon-virtual-guest" title="<bean:message key='systemlist.jsp.virtguest'/>"></i>
+ <rhn:icon type="system-virt-guest" title="<bean:message key='systemlist.jsp.virtguest'/>" />
</c:when>
<c:when test="${current.virtualHost && empty nosystemicons}">
- <i class="fa spacewalk-icon-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>"></i>
+ <rhn:icon type="system-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>" />
</c:when>
<c:otherwise>
- <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i>
+ <rhn:icon type="system-physical" title="<bean:message key='systemlist.jsp.nonvirt'/>" />
</c:otherwise>
</c:choose>
<c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
index 9f9c59d..363aabd 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf
@@ -6,12 +6,12 @@
<c:if test="${not targetuser.disabled}">
<c:set var="url" value="/rhn/users/DisableUser.do?uid=${param.uid}" />
<c:set var="text" value="userdetails.jsp.disable" />
- <c:set var="icon" value="fa-minus-circle" />
+ <c:set var="icon" value="item-ssm-del" />
</c:if>
<c:if test="${targetuser.disabled}">
<c:set var="url" value="/rhn/users/EnableUser.do?uid=${param.uid}" />
<c:set var="text" value="userdetails.jsp.enable" />
- <c:set var="icon" value="fa-plus-circle" />
+ <c:set var="icon" value="item-ssm-add" />
</c:if>
<rhn:toolbar base="h1" icon="header-user"
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.96-1'
by Michael Mraka
Tag 'spacewalk-java-2.1.96-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-12-11 15:58 +0000
Tagging package [spacewalk-java] version [2.1.96-1] in directory [java/].
Changes since spacewalk-search-2.1.8-1:
Michael Mraka (2):
allow channel administrator to view Channel > Managers page
Automatic commit of package [spacewalk-java] release [2.1.96-1].
---
java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java | 17 ++++------
java/spacewalk-java.spec | 5 ++
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 13 insertions(+), 11 deletions(-)
---
10 years, 5 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java | 17 ++++------
java/spacewalk-java.spec | 5 ++
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit 47f34097a0deeab1745de6b26ab8a3a1cc7a88b8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 11 16:58:23 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.96-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 72c09f2..5a93ad9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.95
+Version: 2.1.96
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Dec 11 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.1.96-1
+- allow channel administrator to view Channel > Managers page
+
* Wed Dec 11 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.95-1
- 1040540 - have package search return all matching results
- use rhn:toolbar in 'Show Tomcat Logs' page
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 02f4cfb..f7170be 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.95-1 java/
+2.1.96-1 java/
commit 85f9d26ce9183b399439fd5ca0351741f4838289
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 11 16:41:12 2013 +0100
allow channel administrator to view Channel > Managers page
fixing
You do not have sufficient permissions to perform this action.
com.redhat.rhn.common.security.PermissionException: Lookup user requires Org Admin
at com.redhat.rhn.manager.user.UserManager.lookupUser(UserManager.java:529)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java
index 577e5ab..9fc1286 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java
@@ -85,9 +85,9 @@ public class ManagersSetupAction extends RhnAction implements Listable {
// remove channel managers
for (Iterator<Long> iter = helper.getRemovedKeys().iterator();
iter.hasNext();) {
- User u = UserManager.lookupUser(user, iter.next());
- if (!u.hasRole(RoleFactory.CHANNEL_ADMIN)) {
- UserManager.removeChannelPerm(u, currentChan.getId(),
+ Long uid = iter.next();
+ if (!UserManager.hasRole(uid, RoleFactory.CHANNEL_ADMIN)) {
+ user.getOrg().removeChannelPermissions(uid, currentChan.getId(),
ChannelManager.QRY_ROLE_MANAGE);
}
updated++;
@@ -95,11 +95,11 @@ public class ManagersSetupAction extends RhnAction implements Listable {
// add channel managers
for (Iterator<Long> iter = helper.getAddedKeys().iterator(); iter.hasNext();) {
- User u = UserManager.lookupUser(user, iter.next());
- if (!u.hasRole(RoleFactory.CHANNEL_ADMIN)) {
- UserManager.removeChannelPerm(u, currentChan.getId(),
+ Long uid = iter.next();
+ if (!UserManager.hasRole(uid, RoleFactory.CHANNEL_ADMIN)) {
+ user.getOrg().removeChannelPermissions(uid, currentChan.getId(),
ChannelManager.QRY_ROLE_MANAGE);
- UserManager.addChannelPerm(u, currentChan.getId(),
+ user.getOrg().resetChannelPermissions(uid, currentChan.getId(),
ChannelManager.QRY_ROLE_MANAGE);
}
updated++;
@@ -123,8 +123,7 @@ public class ManagersSetupAction extends RhnAction implements Listable {
User currentUser = context.getCurrentUser();
List<UserOverview> userList = UserManager.activeInOrg2(currentUser);
for (UserOverview uo : userList) {
- User u = UserManager.lookupUser(currentUser, uo.getId());
- uo.setDisabled(u.hasRole(RoleFactory.CHANNEL_ADMIN));
+ uo.setDisabled(UserManager.hasRole(uo.getId(), RoleFactory.CHANNEL_ADMIN));
}
return userList;
}
10 years, 5 months
Changes to 'refs/tags/spacewalk-search-2.1.8-1'
by Milan Zazrivec
Tag 'spacewalk-search-2.1.8-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-11 15:50 +0000
Tagging package [spacewalk-search] version [2.1.8-1] in directory [search-server/spacewalk-search/].
Changes since spacewalk-java-2.1.95-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-search] release [2.1.8-1].
---
rel-eng/packages/spacewalk-search | 2 +-
search-server/spacewalk-search/spacewalk-search.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 5 months
Changes to 'refs/tags/spacewalk-java-2.1.95-1'
by Milan Zazrivec
Tag 'spacewalk-java-2.1.95-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-12-11 15:50 +0000
Tagging package [spacewalk-java] version [2.1.95-1] in directory [java/].
Changes since spacewalk-java-2.1.94-1:
Milan Zazrivec (2):
1040540 - have package search return all matching results
Automatic commit of package [spacewalk-java] release [2.1.95-1].
Tomas Kasparek (1):
use rhn:toolbar in 'Show Tomcat Logs' page
---
java/code/src/com/redhat/rhn/domain/rhnpackage/PackageFactory.java | 29 +++++++---
java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 1
java/code/webapp/WEB-INF/pages/admin/catalina.jsp | 2
java/spacewalk-java.spec | 6 +-
rel-eng/packages/spacewalk-java | 2
search-server/spacewalk-search/src/config/search/rhn_search.conf | 1
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 4 -
7 files changed, 31 insertions(+), 14 deletions(-)
---
10 years, 5 months