kallithea Changeset - f1e0b8aa634b

Changeset - f1e0b8aa634b

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Mads Kiilerich - 11 years ago 2015-01-06 00:54:36
madski@unity3d.com

minor fixes

7 files changed with 10 insertions and 12 deletions:

kallithea/controllers/admin/users.py

kallithea/controllers/files.py

kallithea/lib/db_manage.py

kallithea/model/validators.py

kallithea/public/js/base.js

kallithea/public/js/pyroutes_map.js

kallithea/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -91,15 +91,14 @@ class UsersController(BaseController): @@
         user_actions = lambda user_id, username: (
                 template.get_def("user_actions")
                 .render(user_id, username, _=_, h=h, c=c))
         for user in c.users_list:
             users_data.append({
-                "gravatar": grav_tmpl(user. email, 20),
                 "gravatar": grav_tmpl(user.email, 20),
                 "raw_name": user.username,
                 "username": username(user.user_id, user.username),
                 "firstname": user.name,
                 "lastname": user.lastname,
                 "last_login": h.fmt_date(user.last_login),
                 "last_login_raw": datetime_to_time(user.last_login),

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -187,13 +187,13 @@ class FilesController(BaseRepoController @@
             raise HTTPNotFound()
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return render('files/files_ypjax.html')
         # TODO: tags and bookmarks?
-        c.revision_options = [(c.changeset.raw_id,
         c.revision_options = [(c.changeset.raw_id,
                               _('%s at %s') % (c.changeset.branch, h.short_id(c.changeset.raw_id)))] + \
             [(n, b) for b, n in c.db_repo_scm_instance.branches.items()]
         if c.db_repo_scm_instance.closed_branches:
             prefix = _('(closed)') + ' '
             c.revision_options += [('-', '-')] + \
                 [(n, prefix + b) for b, n in c.db_repo_scm_instance.closed_branches.items()]

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -283,13 +283,12 @@ class DbManage(object): @@
             self.create_user(TEST_USER_REGULAR2_LOGIN, TEST_USER_REGULAR2_PASS,
                              TEST_USER_REGULAR2_EMAIL, False)
     def create_ui_settings(self, repo_store_path):
         """
         Creates ui settings, fills out hooks
         and disables dotencode
         """
         #HOOKS
         hooks1_key = Ui.HOOK_UPDATE
         hooks1_ = self.sa.query(Ui)\
             .filter(Ui.ui_key == hooks1_key).scalar()

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -84,13 +84,13 @@ def UniqueListFromString(): @@
+        )
         def _to_python(self, value, state):
             value = aslist(value, ',')
             seen = set()
             return [c for c in value if not (c in seen or seen.add(c))]
         def empty_value(self, value):
             return []
     return _UniqueListFromString

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -666,22 +666,22 @@ var injectInlineForm = function(tr){ @@
     $form.submit(function(e){
         e.preventDefault();
         if(lineno === undefined){
             alert('Error submitting, line ' + lineno + ' not found.');
             return
+            return;
+        }
         if(f_path === undefined){
             alert('Error submitting, file path ' + f_path + ' not found.');
             return
+            return;
+        }
         var text = $('#text_'+lineno).val();
         if(text == ""){
             return
+            return;
+        }
         $overlay.show();
         var success = function(json_data){
             $tr.removeClass('form-open');

kallithea/public/js/pyroutes_map.js

➞

Show inline comments

 //Format is key == name
 //    "mark_error_fixed": [ # key
 //        "/mark_error_fixed/%(error_id)s", #url template
 //        [
 //        "/mark_error_fixed/%(error_id)s", #url template
 //        [
 //            "error_id" # list of args
 //        ]
-//    ],
 //    ],
 //
 var PROUTES_MAP = {
+}
@@ \ No newline at end of file @@

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -137,13 +137,13 @@ $(document).ready(function(){ @@
         $('.img-diff-swapable')
             .each(function(i,e){
                     $(e).attr('src', $(e).attr('realsrc'));
                 })
             .show();
         });
     $('.btn-image-diff-swap').mousedown(function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')
           .before($('#'+e.currentTarget.id+'-img-b.img-diff-swapable'));
     });
     var reset = function(e){
         $('#'+e.currentTarget.id+'-img-a.img-diff-swapable')

0 comments (0 inline, 0 general)