Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
ISPConfig 3
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
493
Issues
493
List
Boards
Labels
Service Desk
Milestones
Merge Requests
32
Merge Requests
32
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISPConfig
ISPConfig 3
Commits
8f92401c
Commit
8f92401c
authored
Sep 27, 2012
by
Falko Timme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Bugfix: show the correct country flag in client and reseller lists.
parent
046d621d
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
248 additions
and
240 deletions
+248
-240
interface/lib/classes/listform_actions.inc.php
interface/lib/classes/listform_actions.inc.php
+6
-0
interface/web/client/client_list.php
interface/web/client/client_list.php
+1
-0
interface/web/client/reseller_list.php
interface/web/client/reseller_list.php
+1
-0
interface/web/client/templates/clients_list.htm
interface/web/client/templates/clients_list.htm
+1
-1
interface/web/client/templates/resellers_list.htm
interface/web/client/templates/resellers_list.htm
+1
-1
interface/web/themes/default/css/styles.css
interface/web/themes/default/css/styles.css
+238
-238
No files found.
interface/lib/classes/listform_actions.inc.php
View file @
8f92401c
...
...
@@ -248,6 +248,12 @@ class listform_actions {
$order_by_sql
=
"GROUP BY mailuser_id "
.
$order_by_sql
;
}
}
if
(
$this
->
SQLExtSelect
!=
''
)
{
if
(
substr
(
$this
->
SQLExtSelect
,
0
,
1
)
!=
','
)
$this
->
SQLExtSelect
=
','
.
$this
->
SQLExtSelect
;
$extselect
.
=
$this
->
SQLExtSelect
;
}
return
'SELECT '
.
$app
->
listform
->
listDef
[
'table'
]
.
'.*'
.
$extselect
.
' FROM '
.
$app
->
listform
->
listDef
[
'table'
]
.
"
$join
WHERE
$sql_where
$order_by_sql
$limit_sql
"
;
}
...
...
interface/web/client/client_list.php
View file @
8f92401c
...
...
@@ -19,6 +19,7 @@ $app->uses('listform_actions');
$app
->
listform_actions
->
SQLOrderBy
=
'ORDER BY company_name, contact_name, client_id'
;
$app
->
listform_actions
->
SQLExtWhere
=
"limit_client = 0"
;
$app
->
listform_actions
->
SQLExtSelect
=
', client.country as countryiso'
;
$app
->
listform_actions
->
onLoad
();
...
...
interface/web/client/reseller_list.php
View file @
8f92401c
...
...
@@ -49,6 +49,7 @@ $app->uses('listform_actions');
$app
->
listform_actions
->
SQLOrderBy
=
'ORDER BY company_name, contact_name, client_id'
;
$app
->
listform_actions
->
SQLExtWhere
=
"(limit_client > 0 or limit_client = -1)"
;
$app
->
listform_actions
->
SQLExtSelect
=
', client.country as countryiso'
;
$app
->
listform_actions
->
onLoad
();
...
...
interface/web/client/templates/clients_list.htm
View file @
8f92401c
...
...
@@ -46,7 +46,7 @@
<td
class=
"tbl_col_contact_name"
><a
href=
"#"
onclick=
"loadContent('client/client_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="contact_name"}
</a></td>
<td
class=
"tbl_col_username"
><a
href=
"#"
onclick=
"loadContent('client/client_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="username"}
</a></td>
<td
class=
"tbl_col_city"
><a
href=
"#"
onclick=
"loadContent('client/client_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="city"}
</a></td>
<td
class=
"tbl_col_country"
><
div
class=
"country-{tmpl_var name="
country
"}"
><span>
{tmpl_var name="country"}
</span></div
></td>
<td
class=
"tbl_col_country"
><
a
href=
"#"
onclick=
"loadContent('client/client_edit.php?id={tmpl_var name='id'}');"
><div
class=
"country-{tmpl_var name="
countryiso
"}"
style=
"float:left"
></div>
{tmpl_var name="country"}
</a
></td>
<td
class=
"tbl_col_buttons"
>
<tmpl_if
name=
"is_admin"
>
<a
class=
"button icons16 icoLoginAs"
href=
"javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"
><span>
{tmpl_var name='login_as_txt'}
</span></a>
...
...
interface/web/client/templates/resellers_list.htm
View file @
8f92401c
...
...
@@ -43,7 +43,7 @@
<td
class=
"tbl_col_company_name"
><a
href=
"#"
onclick=
"loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="company_name"}
</a></td>
<td
class=
"tbl_col_contact_name"
><a
href=
"#"
onclick=
"loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="contact_name"}
</a></td>
<td
class=
"tbl_col_city"
><a
href=
"#"
onclick=
"loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');"
>
{tmpl_var name="city"}
</a></td>
<td
class=
"tbl_col_country"
><
div
class=
"country-{tmpl_var name="
country
"}"
><span>
{tmpl_var name="country"}
</span></div
></td>
<td
class=
"tbl_col_country"
><
a
href=
"#"
onclick=
"loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');"
><div
class=
"country-{tmpl_var name="
countryiso
"}"
style=
"float:left"
></div>
{tmpl_var name="country"}
</a
></td>
<td
class=
"tbl_col_buttons"
>
<a
class=
"button icons16 icoLoginAs"
href=
"javascript: loadContent('admin/login_as.php?cid={tmpl_var name='id'}');"
><span>
{tmpl_var name='login_as_txt'}
</span></a>
<a
class=
"button icons16 icoDelete"
href=
"javascript: del_record('client/reseller_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"
><span>
{tmpl_var name='delete_txt'}
</span></a>
...
...
interface/web/themes/default/css/styles.css
View file @
8f92401c
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment