1.1 --- a/app/main/registration_admin/index.lua	Mon Feb 18 19:46:36 2019 +0100
     1.2 +++ b/app/main/registration_admin/index.lua	Wed Mar 27 12:40:33 2019 +0100
     1.3 @@ -76,33 +76,40 @@
     1.4                end }
     1.5              end
     1.6  
     1.7 -            local count = Verification:new_selector()
     1.8 -              :add_where("verified_member_id ISNULL")
     1.9 -              :add_where("denied ISNULL")
    1.10 -              :add_where("comment ilike '%mobile phone number already used before'")
    1.11 -              :count()
    1.12 -            ui.tag{ tag = "li", content = function()
    1.13 -              ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "mobile_phone" }, content = _("Phone number used before (#{count})", { count = count }) }
    1.14 -            end }
    1.15 -            
    1.16 -            local count = Verification:new_selector()
    1.17 -              :add_where("verified_member_id ISNULL")
    1.18 -              :add_where("denied ISNULL")
    1.19 -              :add_where("comment ilike '%user with same name already exist'")
    1.20 -              :count()
    1.21 -            ui.tag{ tag = "li", content = function()
    1.22 -              ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "identification" }, content = _("Identification used before (#{count})", { count = count }) }
    1.23 -            end }
    1.24 -            
    1.25 -            
    1.26 -            local count = Verification:new_selector()
    1.27 -              :add_where("verified_member_id ISNULL")
    1.28 -              :add_where("denied ISNULL")
    1.29 -              :add_where("comment ilike '%user with same name already exists'")
    1.30 -              :count()
    1.31 -            ui.tag{ tag = "li", content = function()
    1.32 -              ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "same_name_already_exists" }, content = _("User with same name already exists (#{count})", { count = count }) }
    1.33 -            end }
    1.34 +            if 
    1.35 +              config.self_registration.check_for_italien_mobile_phone
    1.36 +              or config.self_registration.check_for_uk_mobile_phone
    1.37 +            then
    1.38 +              local count = Verification:new_selector()
    1.39 +                :add_where("verified_member_id ISNULL")
    1.40 +                :add_where("denied ISNULL")
    1.41 +                :add_where("comment ilike '%mobile phone number already used before'")
    1.42 +                :count()
    1.43 +              ui.tag{ tag = "li", content = function()
    1.44 +                ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "mobile_phone" }, content = _("Phone number used before (#{count})", { count = count }) }
    1.45 +              end }
    1.46 +            end
    1.47 +
    1.48 +            if not config.self_registration.manual_invitation then            
    1.49 +              local count = Verification:new_selector()
    1.50 +                :add_where("verified_member_id ISNULL")
    1.51 +                :add_where("denied ISNULL")
    1.52 +                :add_where("comment ilike '%user with same name already exist'")
    1.53 +                :count()
    1.54 +              ui.tag{ tag = "li", content = function()
    1.55 +                ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "identification" }, content = _("Identification used before (#{count})", { count = count }) }
    1.56 +              end }
    1.57 +              
    1.58 +              
    1.59 +              local count = Verification:new_selector()
    1.60 +                :add_where("verified_member_id ISNULL")
    1.61 +                :add_where("denied ISNULL")
    1.62 +                :add_where("comment ilike '%user with same name already exists'")
    1.63 +                :count()
    1.64 +              ui.tag{ tag = "li", content = function()
    1.65 +                ui.link{ module = "registration_admin", view = "verification_requests", params = { mode = "same_name_already_exists" }, content = _("User with same name already exists (#{count})", { count = count }) }
    1.66 +              end }
    1.67 +            end
    1.68              
    1.69              local count = Verification:new_selector()
    1.70                :add_where("verified_member_id ISNULL")
    1.71 @@ -166,48 +173,50 @@
    1.72            
    1.73          end }
    1.74  
    1.75 -        ui.container{ content = _"Role accounts" }
    1.76 -      
    1.77 -        ui.tag{ tag = "ul", content = function()
    1.78 +        if config.role_accounts then
    1.79 +
    1.80 +          ui.container{ content = _"Role accounts" }
    1.81 +        
    1.82 +          ui.tag{ tag = "ul", content = function()
    1.83  
    1.84 -          local count = RoleVerification:new_selector()
    1.85 -            :add_where("verified ISNULL")
    1.86 -            :add_where("denied ISNULL")
    1.87 -            :count()
    1.88 -          ui.tag{ tag = "li", content = function()
    1.89 -            ui.link{ module = "registration_admin", view = "role_verification_requests", content = _("Open requests (#{count})", { count = count }) }
    1.90 -          end }
    1.91 -          
    1.92 -          local count = RoleVerification:new_selector()
    1.93 -            :add_where("verified NOTNULL")
    1.94 -            :add_where("denied ISNULL")
    1.95 -            :join("member", nil, "member.id = role_verification.verified_member_id")
    1.96 -            :add_where("member.deleted ISNULL")
    1.97 -            :count()
    1.98 -          ui.tag{ tag = "li", content = function()
    1.99 -            ui.link{ module = "registration_admin", view = "role_verification_accredited", content = _("Accredited (#{count})", { count = count }) }
   1.100 +            local count = RoleVerification:new_selector()
   1.101 +              :add_where("verified ISNULL")
   1.102 +              :add_where("denied ISNULL")
   1.103 +              :count()
   1.104 +            ui.tag{ tag = "li", content = function()
   1.105 +              ui.link{ module = "registration_admin", view = "role_verification_requests", content = _("Open requests (#{count})", { count = count }) }
   1.106 +            end }
   1.107 +            
   1.108 +            local count = RoleVerification:new_selector()
   1.109 +              :add_where("verified NOTNULL")
   1.110 +              :add_where("denied ISNULL")
   1.111 +              :join("member", nil, "member.id = role_verification.verified_member_id")
   1.112 +              :add_where("member.deleted ISNULL")
   1.113 +              :count()
   1.114 +            ui.tag{ tag = "li", content = function()
   1.115 +              ui.link{ module = "registration_admin", view = "role_verification_accredited", content = _("Accredited (#{count})", { count = count }) }
   1.116 +            end }
   1.117 +            
   1.118 +            local count = RoleVerification:new_selector()
   1.119 +              :add_where("verified NOTNULL")
   1.120 +              :add_where("denied ISNULL")
   1.121 +              :join("member", nil, "member.id = role_verification.verified_member_id")
   1.122 +              :add_where("member.deleted NOTNULL")
   1.123 +              :count()
   1.124 +            ui.tag{ tag = "li", content = function()
   1.125 +              ui.link{ module = "registration_admin", view = "role_verification_cancelled", content = _("Cancelled (#{count})", { count = count }) }
   1.126 +            end }
   1.127 +            
   1.128 +            local count = RoleVerification:new_selector()
   1.129 +              :add_where("verified ISNULL")
   1.130 +              :add_where("denied NOTNULL")
   1.131 +              :count()
   1.132 +            ui.tag{ tag = "li", content = function()
   1.133 +              ui.link{ module = "registration_admin", view = "role_verification_rejected", content = _("Rejected (#{count})", { count = count }) }
   1.134 +            end }
   1.135 +            
   1.136            end }
   1.137 -          
   1.138 -          local count = RoleVerification:new_selector()
   1.139 -            :add_where("verified NOTNULL")
   1.140 -            :add_where("denied ISNULL")
   1.141 -            :join("member", nil, "member.id = role_verification.verified_member_id")
   1.142 -            :add_where("member.deleted NOTNULL")
   1.143 -            :count()
   1.144 -          ui.tag{ tag = "li", content = function()
   1.145 -            ui.link{ module = "registration_admin", view = "role_verification_cancelled", content = _("Cancelled (#{count})", { count = count }) }
   1.146 -          end }
   1.147 -          
   1.148 -          local count = RoleVerification:new_selector()
   1.149 -            :add_where("verified ISNULL")
   1.150 -            :add_where("denied NOTNULL")
   1.151 -            :count()
   1.152 -          ui.tag{ tag = "li", content = function()
   1.153 -            ui.link{ module = "registration_admin", view = "role_verification_rejected", content = _("Rejected (#{count})", { count = count }) }
   1.154 -          end }
   1.155 -          
   1.156 -          
   1.157 -        end }
   1.158 +        end          
   1.159  
   1.160        end }
   1.161      end }