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

3 files changed with 3 insertions and 5 deletions:

kallithea/controllers/admin/users.py

kallithea/lib/db_manage.py

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -91,13 +91,12 @@ 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),
                 "raw_name": user.username,
                 "username": username(user.user_id, user.username),
                 "firstname": user.name,
                 "lastname": user.lastname,

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/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');

0 comments (0 inline, 0 general)