@@ -193,8 +240,8 @@
<%= l(:label_technical_title) %>:
|
-
<% end %>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 38f1e3b9f..fc712933c 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -61,7 +61,7 @@
- <%= f.text_field :login, :required => true, :name => "login"%>
+ <%= f.text_field :login, :required => true, :size => 25, :name => "login"%>
<%= l(:label_max_number) %>
@@ -69,13 +69,13 @@
- <%= f.text_field :lastname, :required => true %>
+ <%= f.text_field :lastname, :size => 25, :required => true %>
<%= l(:field_lastname_eg) %>
- <%= f.text_field :firstname, :required => true %>
+ <%= f.text_field :firstname, :size => 25, :required => true %>
<%= l(:field_firstname_eg) %>
diff --git a/db/migrate/20141031122331_change_school_id_for_school.rb b/db/migrate/20141031122331_change_school_id_for_school.rb
new file mode 100644
index 000000000..e042bd48e
--- /dev/null
+++ b/db/migrate/20141031122331_change_school_id_for_school.rb
@@ -0,0 +1,11 @@
+#encoding=UTF-8
+class ChangeSchoolIdForSchool < ActiveRecord::Migration
+ def up
+ sql = "update courses, user_extensions set courses.school_id = user_extensions.school_id
+ where courses.tea_id = user_extensions.user_id"
+ execute(sql)
+ end
+
+ def down
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 957e603b7..70ed2ce36 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20141031065238) do
+ActiveRecord::Schema.define(:version => 20141031122331) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false