Merge lp:~openerp-dev/openobject-client-web/widget-per-user into lp:openobject-client-web/trunk

[Vaibhav Darji]

Widget per user.

[Navrang Oza (noz-tiny)]

Hello vda,

I think wizard for new widget should be opened in popup instead of new tab or new window.
(What are you thinking XMO ?)

In committed changes,
line 11, `user_widget.search` should be there.
line 26, spaces around '='. (minor)

review: Needs Fixing

[lp:~openerp-dev/openobject-client-web/widget-per-user]

3885. By Vaibhav Darji on 2010-11-22

[FIX] Minor changes.

[Vaibhav Darji (vaibhav-openerp)]

Cleanup code.

For wizard action here is the change of code that work according to framework.
replace
 window.open(openobject.http.getURL(this.href)); with
 openAction(openobject.http.getURL(this.href), 'new');

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* Adding popup does not seem to work at all, using Firefox or Safari on the branch (no merging between trunk and branch) clicking the add button (when it's made available/visible) opens a popup with only save/save and edit/close button, can't find a way to add a widget

* Also addition should be done via addition wizard (which might have to be fixed, not sure al finished it)

* It should always be possible to add user widgets.

* Logic for displaying widgets is incorrect:
  - Should only display widgets linked from `res.widget.user`, those with user_id=uid (that part is OK) *and* those with no user_id at all. Those with no user_id set can not be removed by the user (they are administrator-set and global). close_widget is not global.
  - Should not fallback on reading straight from res.widget

* JS is imperfect and incorrect (if widget removal POST generates error, it still removes widgets from the interface which is not correct)

Also needs demo data for testing: when demo data,
* openerp favorites should be set as a global widget (in res.widget.user with user_id not set)
* new widget for twitter of rvalyi should be set as user widget for the administrator
* new widget for twitter of odo should be set as user widget for demo user

That way it is possible to test that per user display works correctly.

I would suggest throwing this branch away and re-doing.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-client-web/widget-per-user]

3886. By Vaibhav Darji on 2010-11-24

[IMP] Check for global widget and improvements.

[Vaibhav Darji (vaibhav-openerp)]

> * Adding popup does not seem to work at all, using Firefox or Safari on the
> branch (no merging between trunk and branch) clicking the add button (when
> it's made available/visible) opens a popup with only save/save and edit/close
> button, can't find a way to add a widget
>
  Please use this server lp:~openerp/openobject-server/widget-per-user, to work wizard properly. Otherwise how the web-client will get the view!

> * Also addition should be done via addition wizard (which might have to be
> fixed, not sure al finished it)
   It is performed as expected when server-branch is compatible.
>
> * It should always be possible to add user widgets.
>
> * Logic for displaying widgets is incorrect:
> - Should only display widgets linked from `res.widget.user`, those with
> user_id=uid (that part is OK) *and* those with no user_id at all. Those with
> no user_id set can not be removed by the user (they are administrator-set and
> global). close_widget is not global.

   Logic is as AL explained, for Administrator `openerp favorites` is added in `res.widget.user`, so is displaying one and giving ADD and close buttons too.
    And for demo user no record exist in `res.widget.user`, so displays all widgets including `openerp favorites` and does not display ADD and Close button.

> - Should not fallback on reading straight from res.widget
>
    Can't understand this comment.

> * JS is imperfect and incorrect (if widget removal POST generates error, it
> still removes widgets from the interface which is not correct)
>
   Commited on branch.

> Also needs demo data for testing: when demo data,
> * openerp favorites should be set as a global widget (in res.widget.user with
> user_id not set)
> * new widget for twitter of rvalyi should be set as user widget for the
> administrator
> * new widget for twitter of odo should be set as user widget for demo user
>
> That way it is possible to test that per user display works correctly.
>
> I would suggest throwing this branch away and re-doing.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

> It is performed as expected when server-branch is compatible.

OK, sorry, forgot about that one.

> And for demo user no record exist in `res.widget.user`, so displays all widgets including `openerp favorites` and does not display ADD and Close button.

No, that's not good, if the user has no widget then the user has no widget period end of the story.

Logic is the following, very simple:

1. widgets in res.widget.user with user_id is null are displayed for current user and don't have delete button

2. widgets in res.widget.user with user_id=uid are displayed for current user and have delete button

3. user can always add new widget to bar, even when he has none displayed

> Can't understand this comment.

The part about demo user (if no widget for user in res.widget.user, you just read everything in res.widget) is not good

review: Needs Fixing

[Xavier (Open ERP) (xmo-deactivatedaccount)]

OK, with correct server branch it does indeed display correctly. Still, logic for displaying widgets is not right, and we need more demo data to demo & test correctly.

[lp:~openerp-dev/openobject-client-web/widget-per-user]

3887. By Vaibhav Darji on 2010-11-24

[FIX] User can add new widget.

3888. By Vaibhav Darji on 2010-11-24

[FIX] removed code by mistake.

[Vaibhav Darji (vaibhav-openerp)]

user can always add new widget to bar.

[lp:~openerp-dev/openobject-client-web/widget-per-user]

3889. By Xavier (Open ERP) on 2010-11-25

[IMP] cleanup some code, remove redundant queries

3890. By Xavier (Open ERP) on 2010-11-25

[IMP] invert removability flag, always set it

3891. By Xavier (Open ERP) on 2010-11-25

[IMP] try to simplify widget-removal JS a bit

3892. By Xavier (Open ERP) on 2010-11-25

[IMP] Move homepage widget JS to the document's head

3893. By Xavier (Open ERP) on 2010-11-25

[IMP] use listcomp to format widgets in way useable within template

=== modified file 'addons/openerp/controllers/root.py'
--- addons/openerp/controllers/root.py	2010-11-24 16:52:46 +0000
+++ addons/openerp/controllers/root.py	2010-11-25 12:31:11 +0000
@@ -131,13 +131,53 @@
                 tree.tree.onselection = None
                 tree.tree.onheaderclick = None
                 tree.tree.showheaders = 0
-        else:
-            # display home action
-            tools = None
+<<<<<<< TREE
+        else:
+            # display home action
+            tools = None
+=======
+        else:
+            # display home action
+            tools = None
+                
+>>>>>>> MERGE-SOURCE
         widgets = rpc.RPCProxy('res.widget')
+<<<<<<< TREE
         maintenance = rpc.RPCProxy('maintenance.contract').status()
         return dict(parents=parents, tools=tools, maintenance=maintenance, load_content=(next and next or ''),
                     widgets=widgets.read(widgets.search([], 0, 0, 0, ctx), [], ctx))
+=======
+        user_widgets = rpc.RPCProxy('res.widget.user')
+        widget_ids = user_widgets.search(
+                ['|', ('user_id', '=', rpc.session.uid), ('user_id', '=', False)],
+                0, 0, 0, ctx)
+        
+        homepage_user_widgets = [
+            dict(widgets.read([wid['widget_id'][0]], [], ctx)[0],
+                 user_widget_id=wid['id'],
+                 # NULL user_id = global = non-removable
+                 removable=bool(wid['user_id']))
+            for wid in user_widgets.read(
+                widget_ids, ['widget_id', 'user_id'], ctx)
+        ]
+
+        return dict(parents=parents, tools=tools, load_content=(next and next or ''),
+                    widgets=homepage_user_widgets)
+    
+    @expose('json', methods=('POST',))
+    def close_user_widget(self, widget_id):
+        error = None
+        try:
+            rpc.RPCProxy('res.widget.user').unlink(widget_id, rpc.session.context)
+        except Exception, e:
+            error = e
+        return dict(error=error)
+    
+    @expose()
+    def add_user_widget(self):
+        return actions.execute_window([False], 'res.widget.wizard')
+        
+>>>>>>> MERGE-SOURCE
 
     @expose(allow_json=True)
     @unsecured

=== modified file 'addons/openerp/controllers/templates/index.mako'
--- addons/openerp/controllers/templates/index.mako	2010-11-24 16:52:46 +0000
+++ addons/openerp/controllers/templates/index.mako	2010-11-25 12:31:11 +0000
@@ -15,9 +15,32 @@
             // Don't load doc if there is a hash-url, it takes precedence
             if(DOCUMENT_TO_LOAD && !hashUrl()) {
                 openLink(DOCUMENT_TO_LOAD);
+                return
             }
+
+            // Make home widgets closable
+            jQuery('#user_widgets a.close').click(function() {
+                var $widget = jQuery(this);
+                jQuery.post(
+                    '/openerp/close_user_widget',
+                    {widget_id: $widget.attr('id')},
+                    function(obj) {
+                        if(obj.error) {
+                            error_display(obj.error);
+                            return;
+                        }
+                        var $root = $widget.closest('.side');
+                        $root.next()
+                             .add($root)
+                             .remove();
+                    }, 'json');
+            });
+            // Addition of new home widgets
+            jQuery('#add_user_widget').click(function() {
+                window.open(this.href);
+                return false;
+            });
         });
-        
     </script>
 </%def>
 
@@ -147,13 +170,35 @@
                                             </li>
                                         </ul>
                                     </div>
+<<<<<<< TREE
                                     % endif
                                     <div class="box-a" style="margin-top: 10px">
+=======
+                                    <div class="sideheader-a">
+>>>>>>> MERGE-SOURCE
                                         <ul class="side">
+                                            <li>
+                                                <a class="button-a" href="${py.url('/openerp/add_user_widget')}" id="add_user_widget">${_("Add")}</a>
+                                            </li>
                                         </ul>
+                                        <h2>${_("Widgets")}</h2>
+                                    </div>
+                                    <div class="box-a" id="user_widgets">
                                         % for widget in widgets:
+<<<<<<< TREE
                                             <div class="sideheader-a" style="padding: 0">
                                                 <h2>${widget['title']}</h2>
+=======
+                                            % if widget['removable']:
+                                                <ul class="side">
+                                                    <li>
+                                                        <a id="${widget['user_widget_id']}" class="close">${_("Close")}</a>
+                                                    </li>
+                                                </ul>
+                                            % endif
+                                            <div>
+                                                <h3>${widget['title']}</h3>
+>>>>>>> MERGE-SOURCE
                                                 ${widget['content']|n}
                                             </div>
                                         % endfor

=== modified file 'addons/openerp/static/css/screen.css'
--- addons/openerp/static/css/screen.css	2010-11-25 11:11:28 +0000
+++ addons/openerp/static/css/screen.css	2010-11-25 12:31:11 +0000
@@ -1950,7 +1950,7 @@
 
 .sideheader-a {
     position: relative;
-    padding-right: 21px;
+    padding-right: 30px;
     border-top: 1px solid #e1dede;
     border-bottom: 1px solid #d2cfcf;
     background: url(../images/sideheader-a-bg.png) 0 100% repeat-x;
@@ -1973,6 +1973,7 @@
     padding-left: 3px;
     padding-right: 3px;
     font-size: 0.9em;
+    cursor: pointer;
 }
 
 .sideheader-a h2 {
@@ -2237,6 +2238,42 @@
 .w50 {
     width: 50% !important;
 }
+
+div.box-a ul.side {
+    float: right;
+    list-style: none;
+    margin: 7px 10px 0 0;
+    padding: 0;
+}
+
+div.box-a ul.side li {
+    display: inline;
+    float: left;
+    margin: 0 0 0 5px;
+}
+
+div.box-a ul.side li a {
+    float: left;
+    overflow: hidden;
+    width: 10px;
+    height: 10px;
+    background: url(../images/sideicons-a.gif) no-repeat;
+    text-indent: -10001px;
+}
+
+div.box-a ul.side li a.move {
+    background-position: 0 0;
+    cursor: move;
+}
+
+div.box-a ul.side li a.minimize {
+    background-position: -10px 0;
+}
+
+div.box-a ul.side li a.close {
+    background-position: -20px 0;
+}
+
 /* SPECIFIC
 ------------------------------------------- */