schema/spacewalk/common/views/views.deps | 2 -
web/html/network/sales/.htaccess | 9 ----
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 28 --------------
3 files changed, 39 deletions(-)
New commits:
commit 44361cdf03ec4926d97146582e891d365b35cb56
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:24:37 2009 +0100
Removing network/sales as it only had .htaccess talking about purchase_history.pxt,
which did not exist.
diff --git a/web/html/network/sales/.htaccess b/web/html/network/sales/.htaccess
deleted file mode 100644
index 8f88de5..0000000
--- a/web/html/network/sales/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-<Files purchase_history.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit d7d3192fd92ba822391d8454acadbe0fb0ccef29
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:23:42 2009 +0100
View web_customer_orders does not exist in Spacewalk 0.7, removing; also removing
purchase_history query.
diff --git a/schema/spacewalk/common/views/views.deps
b/schema/spacewalk/common/views/views.deps
index 4d7d679..46f2da0 100644
--- a/schema/spacewalk/common/views/views.deps
+++ b/schema/spacewalk/common/views/views.deps
@@ -121,8 +121,6 @@ rhn_contact_monitoring :: web_contact
web_user_personal_info
rhn_host_monitoring :: rhnServer rhnServerNetInterface \
rhn_interface_monitoring \
rhn_server_monitoring_info
-web_customer_orders :: web_user_order web_user_order_line \
- rh_product web_contact
rhnSharedChannelView :: rhnChannel rhnChannelTrust rhnTrustedOrgs
rhnSharedChannelTreeView :: rhnSharedChannelView
rhnUserActionOverview :: rhnActionStatus rhnUserServerPerms rhnServerAction \
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 6502112..e0f1228 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -150,34 +150,6 @@ ORDER BY RT.note, RT.id
</query>
</mode>
-<mode name="purchase_history">
- <query params="org_id">
-SELECT DISTINCT * FROM
-(SELECT wce.customer_id,
- wce.active_flag,
- TO_CHAR(wce.start_date_active, 'YYYY-MM-DD') AS start_date_active,
- TO_CHAR(wce.end_date_active, 'YYYY-MM-DD') AS end_date_active,
- wce.product_name,
- wce.service_name,
- wce.product_item_code,
- wce.service_item_code,
- wce.group_label,
- wce.quantity,
- wce.customer_product_id,
- wce.paid,
- wco.order_id
-from web_customer_orders wco,
- web_customer_entitlements wce
-where wce.customer_id = :org_id
- and wco.customer_id(+) = :org_id
- and wce.product_item_code NOT LIKE '__TAX' -- ugly hack, don't show
taxes here
- and wce.quantity >= 0 -- hide the ugly prov upgrade slots
- --and wco.order_id IS NOT NULL
- and wce.customer_product_id = wco.customer_product_id(+)) X
-ORDER BY X.start_date_active DESC, X.order_id DESC, X.product_item_code
- </query>
-</mode>
-
<mode name="user_emailaddress_log">
<query params="support_uid">
SELECT EAL.user_id, WC.login, EAL.address, EAL.reason, TO_CHAR(EAL.created,
'YYYY-MM-DD HH24:MI:SS') as created
Show replies by date