extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) new preference to not display the describtion in the infolog list

Browse Source 
2) fixed not working home display (if you clicked on something you got a black page)
This commit is contained in:
Ralf Becker 2005-07-17 21:54:28 +00:00
parent b68fb24b25
commit 39ead5de4f
6 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
infolog/inc/class.uiinfolog.inc.php
View File

@ -121,7 +121,7 @@
$show_links = $GLOBALS['egw_info']['user']['preferences']['infolog']['show_links'];
if ($show_links != 'none' && ($links = $this->link->get_links('infolog',$info['info_id'])))
if ($show_links != 'none' && $show_links != 'no_describtion' && ($links = $this->link->get_links('infolog',$info['info_id'])))
{
foreach ($links as $link)
{
@ -178,15 +178,18 @@
{
$ids = array( );
}
$rows = array( $query['total'] );
$readonlys = array();
$readonlys = $rows = array();
foreach($ids as $id => $info)
{
$rows[] = $this->get_info($info,$readonlys,$query['action'],$query['action_id']);
$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id']);
if ($GLOBALS['egw_info']['user']['preferences']['infolog']['show_links'] == 'no_describtion')
{
unset($info['info_des']);
}
$rows[] = $info;
}
//echo "<p>readonlys = "; _debug_array($readonlys);
//echo "rows=<pre>".print_r($rows,True)."</pre>\n";
reset($rows);
return $query['total'];
}
@ -302,12 +305,13 @@
{
if ($typ != 'defaults') $all_stati += $stati;
}
$GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog');
$GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologIndex');
return $this->tmpl->exec('infolog.uiinfolog.index',$values,array(
'info_type' => $this->bo->enums['type'],
'info_status' => $all_stati
),$readonlys,$persist,(int) $return_html);
),$readonlys,$persist,$return_html ? -1 : 0);
}
function delete($values=0,$referer='')

3
infolog/inc/hook_settings.inc.php
View File

@ -44,7 +44,8 @@
'all' => lang('all links and attachments'),
'links' => lang('only the links'),
'attach' => lang('only the attachments'),
'none' => lang('no links or attachments')
'none' => lang('no links or attachments'),
'no_describtion' => lang('no describtion, links or attachments'),
);
create_select_box('Show in the InfoLog list','show_links',$show_links,
'Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when u enter InfoLog).');

4
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

3
infolog/setup/phpgw_de.lang
View File

@ -151,6 +151,7 @@ never hide search and filters infolog de Suche und Filter niemals ausblenden
new name infolog de neuer name
new search infolog de Neue Suche
no - cancel infolog de Nein - Abbruch
no describtion, links or attachments infolog de Keine Beschreibung, Verküpfungen oder Anhänge
no entries found, try again ... infolog de Kein Einträge gefunden, nochmal versuchen ...
no filter infolog de kein Filter
no links or attachments infolog de keine Verknüpfungen oder Anhänge
@ -208,6 +209,7 @@ select an app to search in infolog de eine Anwendung zum Durchsuchen ausw
select an entry to link with infolog de einen Eintrag zum Verküpfen auswählen
select to filter by owner infolog de Besiter zum Filtern auswählen
select to filter by responsible infolog de Verantwortlichen zum Filtern auswählen
should infolog display your open entries - not finised tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog de Soll InfoLog die offenen Einträge - nicht beendete Aufgaben, Anrufe oder Notizen - auf der Startsteite anzeigen. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen).
should infolog display your open entries - not finished tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog de Soll InfoLog die offenen Einträge - nicht beendete Aufgaben, Anrufe oder Notizen - auf der Startsteite anzeigen. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen).
should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog de Soll InfoLog Untereinträge in der normalen Ansicht anzeigen oder nicht. Sie können die Untereinträge immer über deren Haupteintrag anzeigen.
should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when u enter infolog). infolog de Soll InfoLog die Verknüpfungen zu anderen Anwendungen und/oder die Datei-Anhänge in der InfoLog Liste (normale Ansicht wenn InfoLog aufgerufen wird) anzeigen.
@ -267,3 +269,4 @@ you have entered an invalid ending date infolog de Sie haben ein ung
you have entered an invalid starting date infolog de Sie haben ein ungültiges Startdatum eingegeben
you have to enter a name, to create a new typ!!! infolog de Sie müssen einen Namen angeben, um einen neuen Typ zu erzeugen!!!
you must enter a subject or a description infolog de Sie müssen einen Titel oder eine Beschreibung eingeben
your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database. infolog de Ihre Datenbank ist NICHT aktuell (%1 gegenüber %2), bitte rufen Sie %3setup%4 auf um ihre Datenbank zu aktualisieren.

3
infolog/setup/phpgw_en.lang
View File

@ -151,6 +151,7 @@ never hide search and filters infolog en Never hide search and filters
new name infolog en new name
new search infolog en New search
no - cancel infolog en No - Cancel
no describtion, links or attachments infolog en no describtion, links or attachments
no entries found, try again ... infolog en no entries found, try again ...
no filter infolog en no Filter
no links or attachments infolog en no links or attachments
@ -207,6 +208,7 @@ select an app to search in infolog en Select an App to search in
select an entry to link with infolog en Select an entry to link with
select to filter by owner infolog en select to filter by owner
select to filter by responsible infolog en select to filter by responsible
should infolog display your open entries - not finised tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog en Should InfoLog display your open entries - not finised tasks, phonecalls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).
should infolog display your open entries - not finished tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog en Should InfoLog display your open entries - not finised tasks, phone calls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).
should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog en Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the subs via their parent.
should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when u enter infolog). infolog en Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when u enter InfoLog).
@ -266,3 +268,4 @@ you have entered an invalid ending date infolog en You have entered an invalid e
you have entered an invalid starting date infolog en You have entered an invalid starting date
you have to enter a name, to create a new typ!!! infolog en You have to enter a name, to create a new type!!!
you must enter a subject or a description infolog en You must enter a subject or a description
your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database. infolog en Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.

6
infolog/templates/default/index.xet
View File

@ -96,7 +96,7 @@
<column/>
<column width="8%"/>
<column width="8%"/>
<column width="12%"/>
<column width="9%"/>
<column width="3%" disabled="@no_actions"/>
<column width="3%" disabled="@no_actions"/>
</columns>
@ -114,7 +114,7 @@
<rows>
<row>
<nextmatch-sortheader label="Subject" id="info_subject"/>
<nextmatch-sortheader label="Priority" align="right" id="info_priority"/>
<nextmatch-sortheader label="Priority" align="right" id="info_priority" options="DESC"/>
</row>
<row>
<nextmatch-sortheader label="Description" id="info_des"/>
@ -130,7 +130,7 @@
<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner"/>
<nextmatch-accountfilter id="info_responsible" options="Responsible" statustext="Select to filter by responsible"/>
</vbox>
<nextmatch-sortheader label="last changed" id="info_datemodified"/>
<nextmatch-sortheader label="last changed" id="info_datemodified" options="DESC"/>
<description value="Sub"/>
<description value="Action"/>
</row>