Saurang Suthar(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--button_consistancy-ssu
into lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1-.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--button_consistancy-ssu/+merge/86879
Hello sir,
I have improved the consistency of buttons regarding meeting in this module.
Thank you.
SSU
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-calendar-hmo-p1--button_consistancy-ssu/+merge/86879
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-calendar-hmo-p1-.
=== modified file 'base_calendar/calendar_event.py'
--- base_calendar/calendar_event.py 2011-12-22 10:35:40 +0000
+++ base_calendar/calendar_event.py 2011-12-26 05:19:24 +0000
@@ -41,24 +41,24 @@
_columns = {
'id': fields.integer('ID'),
'sequence': fields.integer('Sequence'),
- 'name': fields.char('Summary', size=64, required=False, states={'done': [('readonly', True)]}),
- 'date': fields.datetime('Date', states={'done': [('readonly', True)]}),
- 'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}),
+ 'name': fields.char('Summary', size=64, required=False, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'date': fields.datetime('Date', states={'confirm': [('readonly', True)], 'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'date_deadline': fields.datetime('Deadline', states={'confirm': [('readonly', True)], 'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'create_date': fields.datetime('Created', readonly=True),
- 'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
+ 'duration': fields.float('Duration', states={'confirm': [('readonly', True)], 'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'description': fields.text('Description', states={'done': [('readonly', True)]}),
- 'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
+ 'location': fields.char('Location', size=264, help="Location of Event", states={'confirm': [('readonly', True)], 'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'class': fields.selection([('public', 'Public'), ('private', 'Private'), \
- ('confidential', 'Confidential')], 'Mark as', states={'done': [('readonly', True)]}),
+ ('confidential', 'Confidential')], 'Mark as', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
- 'Show as', states={'done': [('readonly', True)]}),
+ 'Show as', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
- 'calendar_id': fields.many2one('calendar.calendar', 'Calendar'),
+ 'calendar_id': fields.many2one('calendar.calendar', 'Calendar', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'vtimezone': fields.selection([(x.lower(), x) for x in pytz.all_timezones], size=64, string='Timezone'),
- 'user_id': fields.many2one('res.users', 'Resposible', required=True),
- 'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
- 'category_id': fields.many2one('calendar.event.category', 'Category'),
- 'allday': fields.boolean('All Day', states={'done': [('readonly', True)]}),
+ 'user_id': fields.many2one('res.users', 'Resposible', required=True, states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'category_id': fields.many2one('calendar.event.category', 'Category', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+ 'allday': fields.boolean('All Day', states={'confirm': [('readonly', True)], 'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the event information without removing it."),
'state': fields.selection([('draft', 'Unconfirmed'),
('confirm', 'Confirmed'),
=== modified file 'base_calendar/calendar_event_view.xml'
--- base_calendar/calendar_event_view.xml 2011-12-22 10:35:40 +0000
+++ base_calendar/calendar_event_view.xml 2011-12-26 05:19:24 +0000
@@ -54,27 +54,32 @@
<separator string="Description" colspan="4" />
<field name="description" nolabel="1" colspan="4" attrs="{'readonly':[('attendee_request_id','!=', False)]}"/>
<separator colspan="4" string="" />
- <group col="5" colspan="4">
+ <group col="8" colspan="4">
<field name="state" select="2" />
+ <button name="do_done"
+ string="Done"
+ states="confirm"
+ type="object"
+ icon="gtk-apply"/>
+ <button name="set_as_draft"
+ string="Set As Unconfirmed"
+ states="confirm,done"
+ type="object"
+ icon="gtk-convert" />
<button name="do_cancel"
string="Cancel"
- states="draft,confirm"
- type="object"
- icon="gtk-cancel" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
- <button name="set_as_draft"
- states="confirm,cancel"
- string="Set As Unconfirmed"
- type="object"
- icon="terp-crm" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
+ states="confirm"
+ type="object"
+ icon="gtk-cancel"/>
<button name="do_confirm"
string="Confirm"
- states="draft,cancel"
+ states="draft"
type="object"
- icon="gtk-apply" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
+ icon="gtk-apply" />
</group>
</page>
<page string="Reminders">
- <field name="alarm_ids" nolabel="1" widget="one2many" mode="tree,form">
+ <field name="alarm_ids" nolabel="1" widget="one2many" mode="tree,form" attrs="{'readonly': ['|', ('state', '=', 'done'), ('state', '=', 'cancel')]}">
<tree string="Reminder details" editable="top">
<field name="interval_type" />
<field name="interval_number"/>
@@ -94,16 +99,17 @@
</form>
</field>
</page>
- <page string="Attendees">
- <field name="notification" attrs="{'invisible':[('attendee_request_id','!=', False)]}"/>
+ <page string="Attendees" attrs="{'readonly': ['|', ('state', '=', 'done'), ('state', '=', 'cancel')]}">
+ <field name="notification"/>
<button
name="%(action_calendar_event_add_attendee_wizard)d"
string="Add" type="action"
- icon="gtk-sort-descending" attrs="{'invisible':[('attendee_request_id','!=', False)]}"
+ icon="gtk-sort-descending"
+
/>
<separator string="Attendee List" colspan="4" />
<field name="attendee_ids" colspan="4"
- nolabel="1" widget="one2many" mode="tree,form" attrs="{'readonly':[('attendee_request_id','!=', False)]}">
+ nolabel="1" widget="one2many" mode="tree,form" attrs="{'readonly': [('state', '=', 'done')]}">
<tree string="Attendees details" editable="top">
<field name="email" />
<field name="total_members"/>
_______________________________________________
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
