Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_homepage-mma into
lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_homepage-mma/+merge/106572
Hello Sir,
I have improved the following things:
1] Added status bar and action buttons on the top bar above the form
2] Improved form view and tree view of module [object: ir.module.module]
3] removed complexity filed from the object [ir.module.module]
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-first_10_clicks_homepage-mma/+merge/106572
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-first_10_clicks_homepage-mma.
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2012-05-15 14:27:54 +0000
+++ openerp/addons/base/module/module.py 2012-05-21 06:34:20 +0000
@@ -161,9 +161,9 @@
return res
_columns = {
- 'name': fields.char("Name", size=128, readonly=True, required=True, select=True),
+ 'name': fields.char("Technical Name", size=128, readonly=True, required=True, select=True),
'category_id': fields.many2one('ir.module.category', 'Category', readonly=True, select=True),
- 'shortdesc': fields.char('Short Description', size=256, readonly=True, translate=True),
+ 'shortdesc': fields.char('Name', size=256, readonly=True, translate=True),
'description': fields.text("Description", readonly=True, translate=True),
'author': fields.char("Author", size=128, readonly=True),
'maintainer': fields.char('Maintainer', size=128, readonly=True),
@@ -211,9 +211,6 @@
'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
'application': fields.boolean('Application', readonly=True),
'icon': fields.char('Icon URL', size=128),
- 'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')],
- string='Complexity', readonly=True,
- help='Level of difficulty of module. Easy: intuitive and easy to use for everyone. Normal: easy to use for business experts. Expert: requires technical skills.'),
}
_defaults = {
@@ -221,7 +218,6 @@
'sequence': 100,
'demo': False,
'license': 'AGPL-3',
- 'complexity': 'normal',
}
_order = 'sequence,name'
@@ -464,7 +460,6 @@
'website': terp.get('website', ''),
'license': terp.get('license', 'AGPL-3'),
'certificate': terp.get('certificate') or False,
- 'complexity': terp.get('complexity', ''),
'sequence': terp.get('sequence', 100),
'application': terp.get('application', False),
'auto_install': terp.get('auto_install', False),
=== modified file 'openerp/addons/base/module/module_view.xml'
--- openerp/addons/base/module/module_view.xml 2012-05-19 08:14:08 +0000
+++ openerp/addons/base/module/module_view.xml 2012-05-21 06:34:20 +0000
@@ -73,7 +73,6 @@
<field name="icon"/>
<field name="name"/>
<field name="state"/>
- <field name="complexity"/>
<templates>
<t t-name="kanban-box">
<div class="oe_module_vignette">
@@ -83,9 +82,12 @@
</a>
<div class="oe_module_desc">
<h4><a type="edit"><field name="shortdesc"/></a></h4>
+<<<<<<< TREE
<p class="oe_module_name">
+=======
+ <p>
+>>>>>>> MERGE-SOURCE
<field name="name"/><br/>
- <span t-if="record.complexity.raw_value == 'Expert'" class="oe_label oe_warning">Complex</span>
</p>
<button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
<button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
@@ -120,15 +122,25 @@
<field name="model">ir.module.module</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Module">
- <group colspan="4" col="6">
- <field name="name"/>
+ <form layout="manual">
+ <div class="oe_form_topbar">
+ <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_form_button_hi"/>
+ <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_form_button_hi"/>
+ <button name="button_uninstall" states="installed" string="Uninstall (beta)"
+ icon="terp-dialog-close" type="object"
+ confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+ <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
+ <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
+ <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
+ <div class="oe_right">
+ <field name="state" widget="statusbar" nolabel="1" statusbar_visible="uninstalled,installed"/>
+ </div>
+ </div>
+ <sheet string="Module" layout="auto">
+ <group colspan="4" col="6" class="oe_form_header">
<field name="shortdesc"/>
<field name="certificate" />
<field name="category_id"/>
- <field name="complexity"/>
- <field name="demo"/>
- <field name="application"/>
</group>
<notebook colspan="4">
<page string="Module">
@@ -142,26 +154,15 @@
<group colspan="2" col="2">
<separator string="Version" colspan="2"/>
<field name="installed_version"/>
- <field name="latest_version"/>
- <field name="published_version"/>
</group>
</group>
<separator string="Description" colspan="4"/>
<field colspan="4" name="description" select="2" nolabel="1"/>
- <newline/>
- <field name="state"/>
- <group col="6" colspan="2">
- <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
- <button name="button_install_cancel" states="to install" string="Cancel Install" icon="gtk-cancel" type="object"/>
- <button name="button_uninstall" states="installed" string="Uninstall (beta)"
- icon="terp-dialog-close" type="object"
- confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
- <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
- <button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object"/>
- <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" icon="gtk-cancel" type="object"/>
- </group>
</page>
- <page string="Dependencies">
+ <page string="Technical Data">
+ <field name="name"/>
+ <field name="demo"/>
+ <field name="application"/>
<field colspan="4" name="dependencies_id" nolabel="1">
<tree string="Dependencies">
<field name="name"/>
@@ -178,6 +179,7 @@
<field colspan="2" name="reports_by_module" nolabel="1"/>
</page>
</notebook>
+ </sheet>
</form>
</field>
</record>
@@ -187,15 +189,11 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree colors="blue:state=='to upgrade' or state=='to install';red:state=='uninstalled';grey:state=='uninstallable';black:state=='installed'" string="Modules">
- <field name="name"/>
- <field name="category_id"/>
+ <field name="name" groups="base.group_no_one"/>
<field name="shortdesc"/>
- <field name="complexity"/>
<field name="author"/>
<field name="installed_version"/>
- <field name="latest_version"/>
<field name="state"/>
- <button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object"/>
</tree>
</field>
</record>
=== modified file 'openerp/addons/base/static/src/css/modules.css'
--- openerp/addons/base/static/src/css/modules.css 2012-05-19 08:15:55 +0000
+++ openerp/addons/base/static/src/css/modules.css 2012-05-21 06:34:20 +0000
@@ -34,6 +34,7 @@
.oe_module_desc p {
margin: 3px 0 5px;
+ color: #808080;
}
.oe_module_desc .oe_button {
=== modified file 'openerp/modules/db.py'
--- openerp/modules/db.py 2012-01-31 21:17:44 +0000
+++ openerp/modules/db.py 2012-05-21 06:34:20 +0000
@@ -77,15 +77,15 @@
cr.execute('INSERT INTO ir_module_module \
(author, website, name, shortdesc, description, \
- category_id, auto_install, state, certificate, web, license, complexity, application, icon, sequence) \
- VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
+ category_id, auto_install, state, certificate, web, license, application, icon, sequence) \
+ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id', (
info['author'],
info['website'], i, info['name'],
info['description'], category_id,
info['auto_install'], state, info['certificate'],
info['web'],
info['license'],
- info['complexity'], info['application'], info['icon'],
+ info['application'], info['icon'],
info['sequence']))
id = cr.fetchone()[0]
cr.execute('INSERT INTO ir_model_data \
=== modified file 'openerp/modules/module.py'
--- openerp/modules/module.py 2012-03-02 11:28:34 +0000
+++ openerp/modules/module.py 2012-05-21 06:34:20 +0000
@@ -329,7 +329,6 @@
'auto_install': False,
'category': 'Uncategorized',
'certificate': None,
- 'complexity': 'normal',
'depends': [],
'description': '',
'icon': get_module_icon(module),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
