Changeset 4773 for branch/umitweb-ng

Show
Ignore:
Timestamp:
05/07/09 02:40:13 (4 years ago)
Author:
rcarvalho
Message:

Merged revisions 4233 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

................

r4233 | gpolo | 2009-03-01 20:28:23 -0300 (Dom, 01 Mar 2009) | 9 lines


Merged revisions 4232 via svnmerge from
http://svn.umitproject.org/svnroot/umit/branch/NetworkInventory


........

r4232 | gpolo | 2009-03-01 20:23:10 -0300 (Sun, 01 Mar 2009) | 1 line


Fixed ticket #233: Use temp values stored while running in dryrun to calculate the current month range.

........

................

Location:
branch/umitweb-ng
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branch/umitweb-ng

    • Property svnmerge-integrated changed from /trunk:1-3190,3263-3267,3269,3271-3278,3285,3307-3308,3366,3379,3383,3567,3628,3678-3679,3705,3720-3729,3735-3738,3742-3748,3765-3766,3771,3788-3789,3792,3794,3797-3804,3849,3858,3876-3877,3879-3880,3927-3930,3932,3936,3939-3940,3946-3948,3953-3954,3965-3966,3968,3972,3993,3995,4000,4006-4007,4010,4012-4013,4015,4017-4019,4021-4025,4027,4029-4031,4033,4035-4038,4040-4042,4044-4045,4049,4054-4064,4073,4087-4092,4095-4099,4101-4103,4106-4110,4113,4118-4123,4128-4137,4140-4144,4146,4152-4156,4158-4168,4174-4175,4184,4188-4189,4192,4198-4199,4202-4206,4208-4214,4218,4229-4231 to /trunk:1-3190,3263-3267,3269,3271-3278,3285,3307-3308,3366,3379,3383,3567,3628,3678-3679,3705,3720-3729,3735-3738,3742-3748,3765-3766,3771,3788-3789,3792,3794,3797-3804,3849,3858,3876-3877,3879-3880,3927-3930,3932,3936,3939-3940,3946-3948,3953-3954,3965-3966,3968,3972,3993,3995,4000,4006-4007,4010,4012-4013,4015,4017-4019,4021-4025,4027,4029-4031,4033,4035-4038,4040-4042,4044-4045,4049,4054-4064,4073,4087-4092,4095-4099,4101-4103,4106-4110,4113,4118-4123,4128-4137,4140-4144,4146,4152-4156,4158-4168,4174-4175,4184,4188-4189,4192,4198-4199,4202-4206,4208-4214,4218,4229-4231,4233

  • branch/umitweb-ng/umitInventory/Calendar.py

    r4721 r4773  
    285285        Returns days range for current date. 
    286286        """ 
    287         return self.get_monthrange(self.year, self.month) 
     287        month = self.month 
     288        year = self.month 
     289        # When running in dryrun mode use the values that would be changed 
     290        # if not running in this mode. 
     291        if self.dryrun: 
     292            month = self.temp.get('month', year) 
     293            year = self.temp.get('year', year) 
     294        return self.get_monthrange(year, month) 
    288295 
    289296 
    … …  
    432439            self.__inc_month(inc) 
    433440            self.day = (inc == -1) and self.get_current_monthrange()[1] or 1 
    434          
    435441 
    436442    def __inc_hour(self, inc=1):