extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-18 07:56:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Home progress:

Browse Source 
- Get new note to open edit dialog automatically
This commit is contained in:
Nathan Gray 2014-11-12 21:54:58 +00:00
parent 57d802eeb5
commit 321bc14ba3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
home/inc/class.home_note_portlet.inc.php
View File

@ -89,10 +89,6 @@ class home_note_portlet extends home_portlet
{ {
$id = $id['id']; $id = $id['id'];
} }
if($etemplate == null)
{
$etemplate = new etemplate_new();
}
$etemplate->read('home.note'); $etemplate->read('home.note');
$etemplate->set_dom_id($id); $etemplate->set_dom_id($id);
@ -101,6 +97,7 @@ class home_note_portlet extends home_portlet
if(!$content['note']) if(!$content['note'])
{ {
$content['note'] = ''; $content['note'] = '';
egw_json_response::get()->apply('app.home.note_edit',array($id));
} }
$etemplate->exec('home.home_note_portlet.exec',$content,array(),array('__ALL__'=>true),array('id' =>$id)); $etemplate->exec('home.home_note_portlet.exec',$content,array(),array('__ALL__'=>true),array('id' =>$id));
@ -117,7 +114,7 @@ class home_note_portlet extends home_portlet
'default' => true 'default' => true
), ),
'edit_settings' => array( 'edit_settings' => array(
'default' => false 'enabled' => false
) )
); );
return $actions; return $actions;

11
home/js/app.js
View File

@ -507,7 +507,14 @@ app.classes.home = AppJS.extend(
* @param {egwActionObject[]} Selected * @param {egwActionObject[]} Selected
*/ */
note_edit: function(action, selected) { note_edit: function(action, selected) {
if(!selected && typeof action == 'string')
{
var id = action;
}
else
{
var id = selected[0].id; var id = selected[0].id;
}
// Aim to match the size // Aim to match the size
var portlet_dom = $j('[id$='+id+'][data-sizex]',this.portlet_container.getDOMNode); var portlet_dom = $j('[id$='+id+'][data-sizex]',this.portlet_container.getDOMNode);
@ -522,8 +529,8 @@ app.classes.home = AppJS.extend(
// Open popup, but add 30 to the height for the toolbar // Open popup, but add 30 to the height for the toolbar
egw.open_link(egw.link('/index.php',{ egw.open_link(egw.link('/index.php',{
menuaction: 'home.home_note_portlet.edit', menuaction: 'home.home_note_portlet.edit',
id: selected[0].id, id: id,
height: window_height - 70 height: window_height - 70
}),action.id+selected[0].id, window_width+'x'+window_height,'home'); }),'home_'+id, window_width+'x'+window_height,'home');
} }
}); });