kallithea Changeset - bd57d1cb9dc3

Changeset - bd57d1cb9dc3

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 15 years ago 2010-12-05 15:47:49
marcin@python-works.com

fixes #62, added option to disable statistics for each repository

5 files changed with 32 insertions and 12 deletions:

rhodecode/controllers/summary.py

rhodecode/model/db.py

rhodecode/model/forms.py

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -15,38 +15,46 @@ @@
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import calendar
 import logging
 from time import mktime
 from datetime import datetime, timedelta
 from vcs.exceptions import ChangesetError
 from pylons import tmpl_context as c, request, url
 from vcs.exceptions import ChangesetError
 from pylons.i18n.translation import _
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Statistics
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.lib.utils import OrderedDict, EmptyChangeset
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Statistics
 from webhelpers.paginate import Page
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib.tasks import get_commits_stats
 from datetime import datetime, timedelta
 from time import mktime
 import calendar
 import logging
 from webhelpers.paginate import Page
 try:
     import json
 except ImportError:
     #python 2.5 compatibility
     import simplejson as json
 log = logging.getLogger(__name__)
 class SummaryController(BaseController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
@@ @@ -93,26 +101,29 @@ class SummaryController(BaseController): @@
             except ChangesetError:
                 c.repo_branches[name] = EmptyChangeset(hash)
         td = datetime.today() + timedelta(days=1)
         y, m, d = td.year, td.month, td.day
         ts_min_y = mktime((y - 1, (td - timedelta(days=calendar.mdays[m])).month,
                             d, 0, 0, 0, 0, 0, 0,))
         ts_min_m = mktime((y, (td - timedelta(days=calendar.mdays[m])).month,
                             d, 0, 0, 0, 0, 0, 0,))
         ts_max_y = mktime((y, m, d, 0, 0, 0, 0, 0, 0,))
         if c.repo_info.dbrepo.enable_statistics:
             c.no_data_msg = _('No data loaded yet')
         run_task(get_commits_stats, c.repo_info.name, ts_min_y, ts_max_y)
         else:
             c.no_data_msg = _('Statistics are disabled for this repository')
         c.ts_min = ts_min_m
         c.ts_max = ts_max_y
         stats = self.sa.query(Statistics)\
             .filter(Statistics.repository == c.repo_info.dbrepo)\
             .scalar()
         if stats and stats.languages:
             c.no_data = False
             lang_stats = json.loads(stats.languages)
             c.commit_data = stats.commit_activity

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -113,24 +113,25 @@ class UserLog(Base): @@
     user = relation('User')
     repository = relation('Repository')
 class Repository(Base):
     __tablename__ = 'repositories'
     __table_args__ = (UniqueConstraint('repo_name'), {'useexisting':True},)
     repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     repo_name = Column("repo_name", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
     repo_type = Column("repo_type", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None)
     user_id = Column("user_id", Integer(), ForeignKey(u'users.user_id'), nullable=False, unique=False, default=None)
     private = Column("private", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     fork_id = Column("fork_id", Integer(), ForeignKey(u'repositories.repo_id'), nullable=True, unique=False, default=None)
     user = relation('User')
     fork = relation('Repository', remote_side=repo_id)
     repo_to_perm = relation('RepoToPerm', cascade='all')
     stats = relation('Statistics', cascade='all', uselist=False)
     repo_followers = relation('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
     def __repr__(self):

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -391,24 +391,25 @@ def PasswordResetForm(): @@
         filter_extra_fields = True
         email = All(ValidSystemEmail(), Email(not_empty=True))
     return _PasswordResetForm
 def RepoForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()):
     class _RepoForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         repo_name = All(UnicodeString(strip=True, min=1, not_empty=True),
                         ValidRepoName(edit, old_data))
         description = UnicodeString(strip=True, min=1, not_empty=True)
         private = StringBoolean(if_missing=False)
         enable_statistics = StringBoolean(if_missing=False)
         repo_type = OneOf(supported_backends)
         if edit:
             user = All(Int(not_empty=True), ValidRepoUser)
         chained_validators = [ValidPerms]
     return _RepoForm
 def RepoForkForm(edit=False, old_data={}, supported_backends=BACKENDS.keys()):
     class _RepoForkForm(formencode.Schema):
         allow_extra_fields = True
         filter_extra_fields = False
         fork_name = All(UnicodeString(strip=True, min=1, not_empty=True),

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -51,25 +51,32 @@ @@
                     ${h.textarea('description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label label-checkbox">
                     <label for="enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('enable_statistics',value="True")}
                 </div>
             </div>
             <div class="field">
                 <div class="label">
                     <label for="user">${_('Owner')}:</label>
                 </div>
                 <div class="input input-small ac">
                     <div class="perm_ac">
                        ${h.text('user',class_='yui-ac-input')}
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -184,25 +184,25 @@ @@
 			  		    	lnk.innerHTML = "${_("show more")}";
 			  		    	lnk.id='code_stats_show_more';
 			  		        td.appendChild(lnk);
 			  		    	show_more.appendChild(td);
 			  		    	show_more.appendChild(document.createElement('td'));
 			  		    	tbl.appendChild(show_more);
+			  		    }
+			  		}
 			  		if(no_data){
 			  			var tr = document.createElement('tr');
 			  			var td1 = document.createElement('td');
-			  			td1.innerHTML = "${_('No data loaded yet')}";
+			  			td1.innerHTML = "${c.no_data_msg}";
 			  			tr.appendChild(td1);
 			  			tbl.appendChild(tr);
+					}
 			  		YUD.get('lang_stats').appendChild(tbl);
 			  		YUE.on('code_stats_show_more','click',function(){
 			  			l = YUD.getElementsByClassName('stats_hidden')
 			  			for (e in l){
 			  			    YUD.setStyle(l[e],'display','');
 			  			};
 			  			YUD.setStyle(YUD.get('code_stats_show_more'),
 			  					'display','none');
 			  		})
@@ @@ -241,25 +241,25 @@ @@
 	</div>
 </div>
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
     <div class="table">
          %if c.no_data:
-           <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${_('No data loaded yet')}</div>
+           <div style="padding:0 10px 10px 15px;font-size: 1.2em;">${c.no_data_msg}</div>
         %endif:
         <div id="commit_history" style="width:460px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
         <div id="overview" style="width:460px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
 		<script type="text/javascript">

0 comments (0 inline, 0 general)