smishchuk/payg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

099 s3_user_filter

Browse Source
This commit is contained in:
smishchuk
2026-10-28 17:03:19 +03:00
parent fd056ec435
commit e29d08a94d
4 changed files with 158 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
s3_ls.cfm
+7 -8
View File
@@ -10,12 +10,8 @@
<cfreturn (a GT 0)? a : ""/>
</cffunction>
<m:prepare_ls entity="s3_user" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
<m:prepare_ls entity="s3_user" settingsKey="s3_user" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/><!--- NB settingsKey --->
<!--- <m:filter_settings target="#pageInfo.entity#_ls">
<m:filterparam filter=#filter# param="quickfilter" ftype="string" prefix="%" suffix="%" expression="((p.project like ?) OR (p.customer like ?) OR (p.customer_alias like ?) OR (p.contragent_class_type like ?) OR (p.division like ?) OR (p.performer_short like ?))" default=""/>
</m:filter_settings> --->
<!--- <cfset pageInfo.settings.filter=#filter#/> --->
<!--- <cftry> --->
<cfquery name="qS3" datasource="billing-s3">
@@ -56,7 +52,7 @@
WHERE rn = 1 AND e.service_id=12
AND NOT cast(s.instance_data->>'isDeleted' as boolean) /*не вдаваясь в другие статусы*/
</cfquery>
<!--- <cfdump var=#qRead#/> --->
<!--- <cfcatch type="database">
<m:ls_catch catch=#cfcatch# status=#pageInfo.status#/>
@@ -101,10 +97,12 @@ select
from qS3 s
left outer join qContragent c on (s.wz=c.wz)
full outer join qS3User u on (s.owner=u.user_id)
where 1=1 <m:filter_build filter=#pageInfo.settings.filter#/>
where 1=1 <m:filter_build filter=#pageInfo.settings.filter# target="hsql"/>
order by <m:order_build sortArray=#pageInfo.settings.sort.sortArray# fieldCount=#fieldCount#/>
</cfquery>
<!--- <cfdump var=#qRead#/> --->
<cfquery name="qCountTotal" datasource="inmem">
select count(*) as cnt
from qS3 s
@@ -180,7 +178,8 @@ full outer join qS3User u on (s.owner=u.user_id)
<td><a href="mailto:#responsible_email#">#responsible_email#</a></td>
<td class="r">#id#</td>
<td<cfif !(isNumeric(owner) AND owner LT 10000)> class="err"</cfif>>#owner#</td>
<!--- <td<cfif !(isNumeric(owner) AND owner LT 10000)> class="err"</cfif>>#owner#</td> --->
<td>#owner#</td>
<td class="r">#bucket_cnt#</td>
<td class="r">#size_byte#</td>