![(please configure the [header_logo] section in trac.ini)](/space/chrome/site/your_project_logo.png){kind=logo}
Changeset 576 for pro-violet-viettel/sourcecode/application/modules
- Timestamp:
- Nov 20, 2014 8:58:58 AM (10 years ago)
- Location:
- pro-violet-viettel/sourcecode/application/modules/admin
- Files:
-
- 5 edited
-
controllers/collaborator.php (modified) (3 diffs)
-
controllers/smstemplate.php (modified) (2 diffs)
-
views/collaborator/index.php (modified) (4 diffs)
-
views/smstemplate/index.php (modified) (4 diffs)
-
views/smstemplate/listview.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php
r422 r576 75 75 if (strlen($input['full_name'])==0) 76 76 { 77 $result['errors'][]= "Tên cá»ng tác viên khÃŽng Äược Äá» trá»ng";77 $result['errors'][]=array("content"=>"Tên cá»ng tác viên khÃŽng Äược Äá» trá»ng","field"=>"full_name"); 78 78 } 79 79 if (strlen($input['login_name'])==0) 80 80 { 81 $result['errors'][]= "Tên ÄÄng nháºp khÃŽng Äược Äá» trá»ng";81 $result['errors'][]=array("content"=>"Tên ÄÄng nháºp khÃŽng Äược Äá» trá»ng","field"=>"login_name"); 82 82 } 83 83 else … … 85 85 if ($this->collabolator_model->isExist(array('field'=>'login_name','value'=>$input['login_name']))) 86 86 { 87 $result['errors'][]= "Tên ÄÄng nháºp Äã Äược sá» dụng";87 $result['errors'][]=array("content"=>"Tên ÄÄng nháºp Äã Äược sá» dụng","field"=>"login_name"); 88 88 } 89 89 } 90 90 if (strlen($input['cellphone'])==0) 91 91 { 92 $result['errors'][]= "Sá» Äiá»n thoại khÃŽng Äược Äá» trá»ng";92 $result['errors'][]=array("content"=>"Sá» Äiá»n thoại khÃŽng Äược Äá» trá»ng","field"=>"cellphone"); 93 93 } 94 94 else … … 96 96 if ($this->collabolator_model->isExist(array('field'=>'cellphone','value'=>$input['cellphone']))) 97 97 { 98 $result['errors'][]= "Sá» Äiá»n thoại Äã Äược sá» dụng";98 $result['errors'][]=array("content"=>"Sá» Äiá»n thoại Äã Äược sá» dụng","field"=>"cellphone"); 99 99 } 100 100 } 101 101 if (strlen($input['passwd'])==0) 102 102 { 103 $result['errors'][]="Máºt khẩu khÃŽng Äược Äá» trá»ng"; 104 } 105 if ($input['passwd'] != $input['passwd2']) 106 { 107 $result['errors'][]="Máºt khẩu khÃŽng trùng nhau"; 103 $result['errors'][]=array("content"=>"Máºt khẩu khÃŽng Äược Äá» trá»ng","field"=>"passwd"); 104 } 105 else 106 { 107 if ($input['passwd'] != $input['passwd2']) 108 { 109 $result['errors'][]=array("content"=>"Máºt khẩu phải trùng nhau","field"=>"passwd"); 110 } 108 111 } 109 112 if (!isset($result['errors'])) -
pro-violet-viettel/sourcecode/application/modules/admin/controllers/smstemplate.php
r411 r576 75 75 if (strlen($input['sms_content'])==0) 76 76 { 77 $result['errors'][]= "Ná»i dung tin nhắn khÃŽng Äược Äá» trá»ng";77 $result['errors'][]=array("content"=>"Ná»i dung tin nhắn khÃŽng Äược Äá» trá»ng","field"=>"sms_content"); 78 78 } 79 79 if (strlen($input['sms_reply'])==0) 80 80 { 81 $result['errors'][]= "Tin nhắn trả vá» khÃŽng Äược Äá» trá»ng";81 $result['errors'][]=array("content"=>"Tin nhắn trả vá» khÃŽng Äược Äá» trá»ng","field"=>"sms_reply"); 82 82 } 83 83 else … … 91 91 */ 92 92 } 93 if (strlen($input['commandcode'])==0) 94 { 95 $result['errors'][]=array("content"=>"Command code khÃŽng Äược Äá» trá»ng","field"=>"commandcode"); 96 } 93 97 if (strlen($input['service_id'])==0) 94 98 { 95 $result['errors'][]= "Mã dá»ch vụ khÃŽng Äược Äá» trá»ng";99 $result['errors'][]=array("content"=>"Service id khÃŽng Äược Äá» trá»ng","field"=>"service_id"); 96 100 } 97 101 else -
pro-violet-viettel/sourcecode/application/modules/admin/views/collaborator/index.php
r461 r576 132 132 133 133 <div class="col-sm-9"> 134 <label class="block clearfix has-error"> 134 135 <span class="input-icon"> 135 136 <input name="full_name" type="text" id="form-field-1" placeholder="Tên cá»ng tác viên"> 136 137 <i class="icon-user blue"></i> 137 138 </span> 139 <div id="full_name" class="help-block error"></div> 140 </label> 138 141 </div> 139 142 <div class="help-block"> </div> … … 143 146 144 147 <div class="col-sm-9"> 148 <label class="block clearfix has-error"> 145 149 <span class="input-icon"> 146 150 <input name="login_name" type="text" id="form-field-1" placeholder="Tà i khoản"> 147 151 <i class="icon-user blue"></i> 148 152 </span> 153 <div id="login_name" class="help-block error"></div> 154 </label> 149 155 </div> 150 156 <div class="help-block"> </div> … … 154 160 155 161 <div class="col-sm-9"> 162 <label class="block clearfix has-error"> 156 163 <span class="input-icon"> 157 164 <input name="cellphone" type="text" id="form-field-1" placeholder="Sá» Äiá»n thoại"> 158 165 <i class="icon-user blue"></i> 159 166 </span> 167 <div id="cellphone" class="help-block error"></div> 168 </label> 160 169 </div> 161 170 <div class="help-block"> </div> … … 167 176 168 177 <div class="col-sm-9"> 178 <label class="block clearfix has-error"> 169 179 <span class="input-icon"> 170 180 <input type="password" name="passwd" id="form-field-2" placeholder="Máºt khẩu"> 171 181 <i class="icon-lock blue"></i> 172 182 </span> 183 <div id="passwd" class="help-block error"></div> 184 </label> 173 185 </div> 174 186 <div class="help-block"> </div> -
pro-violet-viettel/sourcecode/application/modules/admin/views/smstemplate/index.php
r461 r576 134 134 135 135 <div class="col-sm-9"> 136 <label class="block clearfix has-error"> 136 137 <span class="input-icon"> 137 138 <input name="sms_content" type="text" id="form-field-1" placeholder="Mẫu tin nhắn" value=""> 138 139 <i class="icon-user blue"></i> 139 140 </span> 141 <div id="sms_content" class="help-block error"></div> 142 </label> 140 143 </div> 141 144 <div class="help-block"> </div> … … 145 148 146 149 <div class="col-sm-9"> 150 <label class="block clearfix has-error"> 147 151 <span class="input-icon"> 148 152 <input name="sms_reply" type="text" id="form-field-1" placeholder="Tin trả lá»i" value=""> 149 153 <i class="icon-user blue"></i> 150 154 </span> 155 <div id="sms_reply" class="help-block error"></div> 156 </label> 151 157 </div> 152 158 <div class="help-block"> </div> … … 156 162 157 163 <div class="col-sm-9"> 164 <label class="block clearfix has-error"> 158 165 <span class="input-icon"> 159 166 <input name="service_id" type="text" id="form-field-1" placeholder="Mã dá»ch vụ" value=""> 160 167 <i class="icon-user blue"></i> 161 168 </span> 169 <div id="service_id" class="help-block error"></div> 170 </label> 162 171 </div> 163 172 <div class="help-block"> </div> … … 167 176 168 177 <div class="col-sm-9"> 178 <label class="block clearfix has-error"> 169 179 <span class="input-icon"> 170 180 <input name="commandcode" type="text" id="form-field-1" placeholder="Mã lá»nh" value=""> 171 181 <i class="icon-user blue"></i> 172 182 </span> 183 <div id="commandcode" class="help-block error"></div> 184 </label> 173 185 </div> 174 186 <div class="help-block"> </div> -
pro-violet-viettel/sourcecode/application/modules/admin/views/smstemplate/listview.php
r573 r576 76 76 77 77 78 <th class="<?php if ($sorting_field == 'sms_content') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_content" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Há» tên: activate to sort column ascending">Mẫu tin nhắn</th> 79 <th class="<?php if ($sorting_field == 'sms_reply') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_reply" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoại: activate to sort column ascending">Trả lá»i</th> 80 <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";}?>" id="service_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoại: activate to sort column ascending">Mã dá»ch vụ</th> 81 <th class="<?php if ($sorting_field == 'commandcode') {echo $sorting_order;} else {echo "sorting";}?>" id="commandcode" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="Ngà y ÄÄng kÃœ: activate to sort column ascending"> 82 83 Mã câu lá»nh 84 </th> 78 <th class="<?php if ($sorting_field == 'sms_content') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_content" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 283px;" aria-label="Há» tên: activate to sort column ascending">SMS Content</th> 79 <th class="<?php if ($sorting_field == 'sms_reply') {echo $sorting_order;} else {echo "sorting";}?>" id="sms_reply" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoại: activate to sort column ascending">SMS Reply</th> 80 <th class="<?php if ($sorting_field == 'service_id') {echo $sorting_order;} else {echo "sorting";}?>" id="service_id" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 176px;" aria-label="Sá» Äiá»n thoại: activate to sort column ascending">Service Id</th> 81 <th class="<?php if ($sorting_field == 'commandcode') {echo $sorting_order;} else {echo "sorting";}?>" id="commandcode" role="columnheader" tabindex="0" aria-controls="sample-table-2" rowspan="1" colspan="1" style="width: 209px;" aria-label="Ngà y ÄÄng kÃœ: activate to sort column ascending">Command Code</th> 85 82 <th class="sorting_disabled" role="columnheader" rowspan="1" colspan="1" style="width: 133px;" aria-label="">Chức nÄng</th></tr> 86 83 </thead>
Note: See TracChangeset
for help on using the changeset viewer.
