Index: openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql,v
diff -u -N -r1.2.18.2 -r1.2.18.3
--- openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql 26 Sep 2015 11:21:22 -0000 1.2.18.2
+++ openacs-4/packages/acs-subsite/www/admin/applications/index-oracle.xql 27 Apr 2017 15:55:19 -0000 1.2.18.3
@@ -8,11 +8,18 @@
select n.node_id
from site_nodes n,
- apm_packages p,
+ apm_packages p
+ left outer join lang_messages m
+ on m.locale = :locale and
+ '#' || m.package_key || '.' || m.message_key || '#' = p.instance_name
+ left outer join lang_messages md
+ on m.locale = 'en_US' and
+ '#' || md.package_key || '.' || md.message_key || '#' = p.instance_name,
apm_package_types pt
where n.parent_id = :subsite_node_id
and p.package_id = n.object_id
and pt.package_key = p.package_key
+ and [template::list::filter_where_clauses -and -name applications]
order by lower(p.instance_name)
@@ -27,15 +34,14 @@
p.instance_name,
pt.pretty_name as package_pretty_name,
0 as treelevel,
- (select count(*) from apm_parameters par where par.package_key = pt.package_key) as num_parameters
+ (select count(*) from apm_parameters par where par.package_key = pt.package_key) as parameters_p
from site_nodes n,
apm_packages p,
apm_package_types pt
where n.parent_id = :subsite_node_id
and p.package_id = n.object_id
and pt.package_key = p.package_key
and [template::list::page_where_clause -name applications -key n.node_id]
- [template::list::filter_where_clauses -and -name applications]
order by lower(p.instance_name)
Index: openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql,v
diff -u -N -r1.2.18.1 -r1.2.18.2
--- openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql 28 Aug 2015 08:13:51 -0000 1.2.18.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/index-postgresql.xql 27 Apr 2017 15:55:19 -0000 1.2.18.2
@@ -10,9 +10,18 @@
from site_nodes n,
site_nodes np,
apm_packages p
+ left outer join lang_messages m
+ on m.locale = :locale and
+ '#' || m.package_key || '.' || m.message_key || '#' = p.instance_name
+ left outer join lang_messages md
+ on m.locale = 'en_US' and
+ '#' || md.package_key || '.' || md.message_key || '#' = p.instance_name,
+ apm_package_types pt
where np.node_id = :subsite_node_id
and n.tree_sortkey between np.tree_sortkey and tree_right(np.tree_sortkey)
and p.package_id = n.object_id
+ and pt.package_key = p.package_key
+ [template::list::filter_where_clauses -and -name applications]
order by n.tree_sortkey
@@ -27,7 +36,8 @@
p.instance_name,
tree_level(n.tree_sortkey) - tree_level(np.tree_sortkey) as treelevel,
pt.pretty_name as package_pretty_name,
- (select count(*) from apm_parameters par where par.package_key = pt.package_key) as num_parameters
+ exists (select 1 from apm_parameters
+ where package_key = pt.package_key) as parameters_p
from site_nodes n,
site_nodes np,
apm_packages p,
@@ -37,7 +47,6 @@
and p.package_id = n.object_id
and pt.package_key = p.package_key
and [template::list::page_where_clause -name applications -key n.node_id]
- [template::list::filter_where_clauses -and -name applications]
order by n.tree_sortkey
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.adp,v
diff -u -N -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-subsite/www/admin/applications/index.adp 3 Jul 2015 10:25:44 -0000 1.7
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.adp 27 Apr 2017 15:55:19 -0000 1.7.2.1
@@ -2,5 +2,17 @@
@page_title;literal@
@context;literal@
-
+
+
+
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.tcl,v
diff -u -N -r1.11.2.3 -r1.11.2.4
--- openacs-4/packages/acs-subsite/www/admin/applications/index.tcl 10 Sep 2015 08:21:38 -0000 1.11.2.3
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.tcl 27 Apr 2017 15:55:19 -0000 1.11.2.4
@@ -6,13 +6,39 @@
@cvs-id $Id$
} {
page:naturalnum,optional
+ {search_name ""}
+ {search_url ""}
+ {search_application ""}
}
set page_title [_ acs-subsite.Applications]
set context [list $page_title]
set subsite_node_id [ad_conn subsite_node_id]
+set locale [ad_conn locale]
+
+ad_form \
+ -name filter \
+ -edit_buttons [list [list "Go" go]] \
+ -form {
+ {search_name:text,optional
+ {label "#acs-subsite.Name#"}
+ {html {length 20} }
+ {value $search_name}
+ }
+ {search_url:text,optional
+ {label "#acs-subsite.URL#"}
+ {html {length 20} }
+ {value $search_url}
+ }
+ {search_application:text,optional
+ {label "#acs-subsite.Application#"}
+ {html {length 20} }
+ {value $search_application}
+ }
+ } -on_submit {}
+
list::create \
-name applications \
-multirow applications \
@@ -65,13 +91,25 @@
link_url_eval {[export_vars -base application-delete { node_id }]}
link_html { title "#acs-subsite.Delete_this_application#" }
}
+ } -filters {
+ search_name {
+ hide_p 1
+ where_clause {(:search_name is null or upper(coalesce(coalesce(m.message, md.message), p.instance_name)) like '%' || upper(:search_name) || '%')}
+ }
+ search_url {
+ hide_p 1
+ where_clause {(:search_url is null or upper(n.name) like '%' || upper(:search_url) || '%')}
+ }
+ search_application {
+ hide_p 1
+ where_clause {(:search_application is null or upper(pt.pretty_name) like '%' || upper(:search_application) || '%')}
+ }
}
-
db_multirow -extend { parameter_url } applications select_applications_page {} {
set instance_name [string repeat "- " $treelevel]$instance_name
- if { $num_parameters > 0 } {
+ if { $parameters_p } {
set parameter_url [export_vars -base ../../shared/parameters { package_id { return_url [ad_return_url] } }]
}
}