Merge branch 'standalone_develop' into dev_osredm_server

app/assets/javascripts/admins/users/edit.js

@@ -134,11 +134,11 @@ $(document).on('turbolinks:load', function() {
       rules: {
         "user[password]": {
           required: false,
-          minlength: 5
+          minlength: 8
         },
         "user[password_confirmation]": {
           required: false,
-          minlength: 5,
+          minlength: 8,
           equalTo: "#user_password"
         },
       },

app/controllers/owners_controller.rb

@@ -44,6 +44,7 @@ class OwnersController < ApplicationController
       org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @owner.id}).to_sql
       projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
       user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @owner.login) ? projects : projects.visible
+      @user_projects_count = user_projects.size
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size

app/controllers/users_controller.rb

@@ -51,6 +51,7 @@ class UsersController < ApplicationController
       org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
       projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
       user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
+      @user_projects_count = user_projects.size
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size

app/views/owners/show.json.jbuilder

@@ -12,6 +12,7 @@ elsif @owner.present? && @owner.is_a?(User)
   json.undo_events @undo_events
   json.user_composes_count @user_composes_count
   json.user_org_count @user_org_count
+  json.user_project_count @user_projects_count
   json.common_projects_count @projects_common_count
   json.mirror_projects_count @projects_mirrior_count
   json.sync_mirror_projects_count @projects_sync_mirrior_count

app/views/users/me.json.jbuilder

@@ -4,3 +4,4 @@ json.user_id @user.id
 json.image_url url_to_avatar(@user)
 json.admin @user.admin
 json.email @user.mail
+json.phone @user.phone

app/views/users/show.json.jbuilder

@@ -5,6 +5,7 @@ json.undo_join_projects @common_applied_projects.size
 json.undo_events @undo_events
 json.user_composes_count @user_composes_count
 json.user_org_count @user_org_count
+json.user_projects_count @user_projects_count
 json.common_projects_count @projects_common_count
 json.mirror_projects_count @projects_mirrior_count
 json.sync_mirror_projects_count @projects_sync_mirrior_count